[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-02421f98ec55c3ff118f358740ff640f096c7ad6@git.kernel.org>
Date: Wed, 8 Apr 2009 13:00:45 GMT
From: Yinghai Lu <yinghai@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/apic] x86: consistent about warm_reset_vector for UN_NON_UNIQUE_APIC
Commit-ID: 02421f98ec55c3ff118f358740ff640f096c7ad6
Gitweb: http://git.kernel.org/tip/02421f98ec55c3ff118f358740ff640f096c7ad6
Author: Yinghai Lu <yinghai@...nel.org>
AuthorDate: Fri, 3 Apr 2009 17:15:53 -0700
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 8 Apr 2009 14:50:28 +0200
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@...nel.org>
LKML-Reference: <49D6A6B9.6060501@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 bddf2cc..bf8ad63 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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists