diff options
author | Suresh Siddha <suresh.b.siddha@intel.com> | 2010-08-09 20:20:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 23:45:06 -0400 |
commit | d7a7c573936a86474c4a5090a45a4bc6e680c117 (patch) | |
tree | 1dfe757dca1ce4302e84c5ed0fa39c63007a9c52 /arch/ia64/kernel/smpboot.c | |
parent | e446127134de06c4aceaa511f411d06eac91634b (diff) |
x86, ia64, smp: use workqueues unconditionally during do_boot_cpu()
Workqueues are now initialized as part of the early_initcall(). So they
are available for use during cold boot process aswell.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 1d85d8cfaa7d..d003b502a432 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -508,21 +508,18 @@ do_boot_cpu (int sapicid, int cpu) | |||
508 | .done = COMPLETION_INITIALIZER(c_idle.done), | 508 | .done = COMPLETION_INITIALIZER(c_idle.done), |
509 | }; | 509 | }; |
510 | 510 | ||
511 | /* | ||
512 | * We can't use kernel_thread since we must avoid to | ||
513 | * reschedule the child. | ||
514 | */ | ||
511 | c_idle.idle = get_idle_for_cpu(cpu); | 515 | c_idle.idle = get_idle_for_cpu(cpu); |
512 | if (c_idle.idle) { | 516 | if (c_idle.idle) { |
513 | init_idle(c_idle.idle, cpu); | 517 | init_idle(c_idle.idle, cpu); |
514 | goto do_rest; | 518 | goto do_rest; |
515 | } | 519 | } |
516 | 520 | ||
517 | /* | 521 | schedule_work(&c_idle.work); |
518 | * We can't use kernel_thread since we must avoid to reschedule the child. | 522 | wait_for_completion(&c_idle.done); |
519 | */ | ||
520 | if (!keventd_up()) | ||
521 | c_idle.work.func(&c_idle.work); | ||
522 | else { | ||
523 | schedule_work(&c_idle.work); | ||
524 | wait_for_completion(&c_idle.done); | ||
525 | } | ||
526 | 523 | ||
527 | if (IS_ERR(c_idle.idle)) | 524 | if (IS_ERR(c_idle.idle)) |
528 | panic("failed fork for CPU %d", cpu); | 525 | panic("failed fork for CPU %d", cpu); |