From 98d5c807ac9897a28631d4c86e059375a1f0475c Mon Sep 17 00:00:00 2001
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Date: Fri, 19 Oct 2007 18:21:11 -0700
Subject: [PATCH] --- yaml --- r: 72357 b: refs/heads/master c:
 9b7711f0839d12edac3abfc2f3e4c5bdc660878b h: refs/heads/master i:   72355:
 ee7b6757220549708dc34d8ffa0afdffef5f9cfb v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/apic_64.c | 14 ++++++++++++++
 trunk/include/asm-x86/apic_64.h |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4b213c1f1611..ed0291f5fc5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 703530238b580d69d4a112d3ab3d58c0eb1e7246
+refs/heads/master: 9b7711f0839d12edac3abfc2f3e4c5bdc660878b
diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c
index f47bc493dba9..f28ccb588fba 100644
--- a/trunk/arch/x86/kernel/apic_64.c
+++ b/trunk/arch/x86/kernel/apic_64.c
@@ -287,6 +287,20 @@ void disable_local_APIC(void)
 	apic_write(APIC_SPIV, value);
 }
 
+void lapic_shutdown(void)
+{
+	unsigned long flags;
+
+	if (!cpu_has_apic)
+		return;
+
+	local_irq_save(flags);
+
+	disable_local_APIC();
+
+	local_irq_restore(flags);
+}
+
 /*
  * This is to verify that we're looking at a real local APIC.
  * Check these against your board if the CPUs aren't getting
diff --git a/trunk/include/asm-x86/apic_64.h b/trunk/include/asm-x86/apic_64.h
index 3c8f21eef0be..2747a11a2b19 100644
--- a/trunk/include/asm-x86/apic_64.h
+++ b/trunk/include/asm-x86/apic_64.h
@@ -69,6 +69,7 @@ extern void clear_local_APIC (void);
 extern void connect_bsp_APIC (void);
 extern void disconnect_bsp_APIC (int virt_wire_setup);
 extern void disable_local_APIC (void);
+extern void lapic_shutdown (void);
 extern int verify_local_APIC (void);
 extern void cache_APIC_registers (void);
 extern void sync_Arb_IDs (void);