diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-04-03 17:15:53 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 14:50:28 +0200 |
| commit | 02421f98ec55c3ff118f358740ff640f096c7ad6 (patch) | |
| tree | 73120c979c2796850a0ce9f70c147988f2b27190 /arch/x86/kernel/smpboot.c | |
| parent | cdc1cb0d4445f39561a65204d26f89365f917550 (diff) | |
| download | linux-02421f98ec55c3ff118f358740ff640f096c7ad6.tar.bz2 | |
x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC
Impact: cleanup
didn't set it for UV_NON_UNIQUE_APIC, so don't restore it
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <49D6A6B9.6060501@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index bddf2ccaf325..bf8ad6344b18 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -822,10 +822,12 @@ do_rest: /* mark "stuck" area as not stuck */ *((volatile unsigned long *)trampoline_base) = 0; - /* - * Cleanup possible dangling ends... - */ - smpboot_restore_warm_reset_vector(); + if (get_uv_system_type() != UV_NON_UNIQUE_APIC) { + /* + * Cleanup possible dangling ends... + */ + smpboot_restore_warm_reset_vector(); + } return boot_error; } |