diff options
| author | Russell King | 2010-07-31 15:20:16 +0200 |
|---|---|---|
| committer | Russell King | 2010-07-31 15:20:16 +0200 |
| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 (patch) | |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 /arch/arm/kernel/entry-armv.S | |
| parent | Merge branch 'misc' into devel (diff) | |
| parent | Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into... (diff) | |
| download | kernel-qcow2-linux-7b70c4275f28702b76b273c8534c38f8313812e9.tar.gz kernel-qcow2-linux-7b70c4275f28702b76b273c8534c38f8313812e9.tar.xz kernel-qcow2-linux-7b70c4275f28702b76b273c8534c38f8313812e9.zip | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index e864e482118a..bb8e93a76407 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -737,6 +737,11 @@ ENTRY(__switch_to) ldr r6, [r2, #TI_CPU_DOMAIN] #endif set_tls r3, r4, r5 +#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) + ldr r7, [r2, #TI_TASK] + ldr r8, =__stack_chk_guard + ldr r7, [r7, #TSK_STACK_CANARY] +#endif #ifdef CONFIG_MMU mcr p15, 0, r6, c3, c0, 0 @ Set domain register #endif @@ -745,6 +750,9 @@ ENTRY(__switch_to) ldr r0, =thread_notify_head mov r1, #THREAD_NOTIFY_SWITCH bl atomic_notifier_call_chain +#if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) + str r7, [r8] +#endif THUMB( mov ip, r4 ) mov r0, r5 ARM( ldmia r4, {r4 - sl, fp, sp, pc} ) @ Load all regs saved previously |