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>
This commit is contained in:
parent
cdc1cb0d44
commit
02421f98ec
1 changed files with 6 additions and 4 deletions
|
@ -822,10 +822,12 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
|
|||
/* 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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue