[PATCH] x86: only set warm_reset_vector for NMI

[Yinghai Lu]

Impact: cleanup

don't need to set that for INIT etc

Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>

---
 arch/x86/kernel/smpboot.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: linux-2.6/arch/x86/kernel/smpboot.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/smpboot.c
+++ linux-2.6/arch/x86/kernel/smpboot.c
@@ -609,7 +609,7 @@ wakeup_secondary_cpu_via_nmi(int logical
 	return (send_status | accept_status);
 }
 
-int __devinit
+static int __devinit
 wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
 {
 	unsigned long send_status, accept_status = 0;
@@ -816,11 +816,14 @@ do_rest:
 
 	atomic_set(&init_deasserted, 0);
 
-	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
+	if (apic->wakeup_secondary_cpu == wakeup_secondary_cpu_via_nmi) {
 
 		pr_debug("Setting warm reset code and vector.\n");
 
 		smpboot_setup_warm_reset_vector(start_ip);
+	}
+
+	if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
 		/*
 		 * Be paranoid about clearing APIC errors.
 		*/
@@ -893,10 +896,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 (apic->wakeup_secondary_cpu == wakeup_secondary_cpu_via_nmi) {
+		/*
+		 * Cleanup possible dangling ends...
+		 */
+		smpboot_restore_warm_reset_vector();
+	}
 
 	return boot_error;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/