1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ed556d50d7ed..6f27facbaa9b 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -75,7 +75,6 @@
 #include <asm/uv/uv.h>
 #include <linux/mc146818rtc.h>
 #include <asm/i8259.h>
-#include <asm/realmode.h>
 #include <asm/misc.h>
 #include <asm/qspinlock.h>
 
@@ -934,7 +933,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
          * the targeted processor.
          */
 
-        if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
+        if (x86_platform.legacy.warm_reset) {
 
                 pr_debug("Setting warm reset code and vector.\n");
 
@@ -1006,7 +1005,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
         /* mark "stuck" area as not stuck */
         *trampoline_status = 0;
 
-        if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
+        if (x86_platform.legacy.warm_reset) {
                 /*
                  * Cleanup possible dangling ends...
                  */