From 347878fb7ef58b01174766295927020b72dcef81 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 26 Sep 2006 10:52:35 +0200
Subject: [PATCH] --- yaml --- r: 35887 b: refs/heads/master c:
 3d08a256da8aed5300bd0752200ece426f49b050 h: refs/heads/master i:   35885:
 7d4ae5eba3f2b0cbb71b1089d85d19a41991ba5b   35883:
 8518236e8df9d6018a4b4e4ad3a0b1a6b7db63ff   35879:
 dc121b74844d5e3b0393f88436925631062d63db   35871:
 236a4065630142b8926db6e1815a63b550432326 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/i386/kernel/apic.c | 13 ++++++++++++-
 trunk/include/asm-i386/apic.h | 12 ------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 37ed08afb80d..767691f0ed04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8924acb2ef46b96c93f97025815ef3843cb67a2
+refs/heads/master: 3d08a256da8aed5300bd0752200ece426f49b050
diff --git a/trunk/arch/i386/kernel/apic.c b/trunk/arch/i386/kernel/apic.c
index ce75e71b694f..90faae5c5d30 100644
--- a/trunk/arch/i386/kernel/apic.c
+++ b/trunk/arch/i386/kernel/apic.c
@@ -52,7 +52,18 @@ static cpumask_t timer_bcast_ipi;
 /*
  * Knob to control our willingness to enable the local APIC.
  */
-int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */
+static int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */
+
+static inline void lapic_disable(void)
+{
+	enable_local_apic = -1;
+	clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
+}
+
+static inline void lapic_enable(void)
+{
+	enable_local_apic = 1;
+}
 
 /*
  * Debug level
diff --git a/trunk/include/asm-i386/apic.h b/trunk/include/asm-i386/apic.h
index 8c5331ceca7b..3a42b7d6fc92 100644
--- a/trunk/include/asm-i386/apic.h
+++ b/trunk/include/asm-i386/apic.h
@@ -16,20 +16,8 @@
 #define APIC_VERBOSE 1
 #define APIC_DEBUG   2
 
-extern int enable_local_apic;
 extern int apic_verbosity;
 
-static inline void lapic_disable(void)
-{
-	enable_local_apic = -1;
-	clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
-}
-
-static inline void lapic_enable(void)
-{
-	enable_local_apic = 1;
-}
-
 /*
  * Define the default level of output to be very little
  * This can be turned up by using apic=verbose for more