diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-18 15:31:33 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-18 15:31:33 +1100 |
commit | 6f0b2434454f414f37a5ab38815d414181202d65 (patch) | |
tree | a16332063c2b924c7d1a5372cab7b82a2ea37ea2 /arch | |
parent | b8217e989e2bf186b0ffb868d5a560bfe3c2c8ef (diff) | |
parent | dc186ad741c12ae9ecac8b89e317ef706fdaf8f6 (diff) |
Merge remote branch 'workqueues/for-next'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 565ebc65920e..ba43dfed353d 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -687,7 +687,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), }; - INIT_WORK(&c_idle.work, do_fork_idle); + INIT_WORK_ON_STACK(&c_idle.work, do_fork_idle); alternatives_smp_switch(1); @@ -713,6 +713,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) if (IS_ERR(c_idle.idle)) { printk("failed fork for CPU %d\n", cpu); + destroy_work_on_stack(&c_idle.work); return PTR_ERR(c_idle.idle); } @@ -831,6 +832,7 @@ do_rest: smpboot_restore_warm_reset_vector(); } + destroy_work_on_stack(&c_idle.work); return boot_error; } |