diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 18:16:07 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 18:16:07 (GMT) |
commit | 805e318548fa0f6007bcece06bde1ddd9393246c (patch) | |
tree | 421f6d22d9b57289110da25520f0104e0bd338b6 /arch | |
parent | 4db88eb4c300333ed37585f75ab9a664ec537d68 (diff) | |
parent | 29ce3785b22da47c49f4ef6e14b9014fa5dee261 (diff) | |
download | linux-805e318548fa0f6007bcece06bde1ddd9393246c.tar.xz |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull cpu idle fixes from Thomas Gleixner:
- Add a missing irq enable. Fallout of the idle conversion
- Fix stackprotector wreckage caused by the idle conversion
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
idle: Enable interrupts in the weak arch_cpu_idle() implementation
idle: Add the stack canary init to cpu_startup_entry()
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/process.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 4e7a37f..81a5f5e 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -277,18 +277,6 @@ void exit_idle(void) } #endif -void arch_cpu_idle_prepare(void) -{ - /* - * If we're the non-boot CPU, nothing set the stack canary up - * for us. CPU0 already has it initialized but no harm in - * doing it again. This is a good place for updating it, as - * we wont ever return from this function (so the invalid - * canaries already on the stack wont ever trigger). - */ - boot_init_stack_canary(); -} - void arch_cpu_idle_enter(void) { local_touch_nmi(); |