diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-07 11:21:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-07 11:21:48 +1000 |
| commit | ec82535ae6d6d9e7043e2b1832a6d7c56818b102 (patch) | |
| tree | e460c8aa16b2411bfbff0c1c519295ca831083d2 /arch/arm/kernel/asm-offsets.c | |
| parent | 434ab53ab07326215d1e9429a0135841ce0c6410 (diff) | |
| parent | 5c6dfa5df60293a98a0ad92006bee68c7d40acfd (diff) | |
Merge remote branch 'arm/devel'
Diffstat (limited to 'arch/arm/kernel/asm-offsets.c')
| -rw-r--r-- | arch/arm/kernel/asm-offsets.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c index 883511522fca..85f2a019f77b 100644 --- a/arch/arm/kernel/asm-offsets.c +++ b/arch/arm/kernel/asm-offsets.c @@ -40,6 +40,9 @@ int main(void) { DEFINE(TSK_ACTIVE_MM, offsetof(struct task_struct, active_mm)); +#ifdef CONFIG_CC_STACKPROTECTOR + DEFINE(TSK_STACK_CANARY, offsetof(struct task_struct, stack_canary)); +#endif BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); |