diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2008-11-17 15:19:53 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 00:27:24 +0100 |
| commit | 54ac14a8e982ae6c7ac71ee2b0d0173b974509e2 (patch) | |
| tree | fa716a60474c2e3592cd06afa52f381cdd2cece8 /arch/x86/kernel/es7000_32.c | |
| parent | 569712b2b0970fa5b19673544d62ae661d04a220 (diff) | |
| download | op-kernel-dev-54ac14a8e982ae6c7ac71ee2b0d0173b974509e2.zip op-kernel-dev-54ac14a8e982ae6c7ac71ee2b0d0173b974509e2.tar.gz | |
x86: fix wakeup_cpu with numaq/es7000, v2, fix
Impact: fix wakeup_secondary_cpu with hotplug
We can not put that into x86_quirks, because that is __initdata.
So try to move that to genapic, and add update_genapic in x86_quirks.
later we even could use that stub to:
1. autodetect CONFIG_ES7000_CLUSTERED_APIC
2. more correct inquire_remote_apic with apic_verbosity setting.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/es7000_32.c')
| -rw-r--r-- | arch/x86/kernel/es7000_32.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c index bed10dd..fb3bfe6 100644 --- a/arch/x86/kernel/es7000_32.c +++ b/arch/x86/kernel/es7000_32.c @@ -40,6 +40,7 @@ #include <asm/smp.h> #include <asm/apicdef.h> #include <mach_mpparse.h> +#include <asm/genapic.h> #include <asm/setup.h> /* @@ -180,6 +181,13 @@ static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip) return 0; } + +static int __init es7000_update_genapic(void) +{ + genapic->wakeup_cpu = wakeup_secondary_cpu_via_mip; + + return 0; +} #endif void __init @@ -197,8 +205,9 @@ setup_unisys(void) else es7000_plat = ES7000_CLASSIC; ioapic_renumber_irq = es7000_rename_gsi; + #ifdef CONFIG_ES7000_CLUSTERED_APIC - x86_quirks->wakeup_secondary_cpu = wakeup_secondary_cpu_via_mip; + x86_quirks->update_genapic = es7000_update_genapic; #endif } |
