diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 17:32:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 17:35:19 +0100 |
| commit | f632ddcc0786149c0e4bef9b6b44c96a75c0d074 (patch) | |
| tree | b4629732cfab5c91838cd4e872f2ccfe4a3e964a /arch/x86/kernel/setup.c | |
| parent | 54ac14a8e982ae6c7ac71ee2b0d0173b974509e2 (diff) | |
| download | op-kernel-dev-f632ddcc0786149c0e4bef9b6b44c96a75c0d074.zip op-kernel-dev-f632ddcc0786149c0e4bef9b6b44c96a75c0d074.tar.gz | |
x86: fix wakeup_cpu with numaq/es7000, v2, fix #2
Impact: fix boot crash
fix default_update_genapic().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c366e89..3132890 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -585,8 +585,10 @@ early_param("elfcorehdr", setup_elfcorehdr); static int __init default_update_genapic(void) { -#if defined(CONFIG_X86_GENERICARCH) || defined(CONFIG_X86_64) - genapic->wakeup_cpu = wakeup_secondary_cpu_via_nmi; +#ifdef CONFIG_X86_SMP +# if defined(CONFIG_X86_GENERICARCH) || defined(CONFIG_X86_64) + genapic->wakeup_cpu = wakeup_secondary_cpu_via_init; +# endif #endif return 0; |
