Browse Source

[PATCH] i386: Make enable_local_apic static

enable_local_apic can now become static.

Cc: len.brown@intel.com

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Adrian Bunk 18 years ago
parent
commit
3d08a256da
2 changed files with 12 additions and 13 deletions
  1. 12 1
      arch/i386/kernel/apic.c
  2. 0 12
      include/asm-i386/apic.h

+ 12 - 1
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.
  * 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
  * Debug level

+ 0 - 12
include/asm-i386/apic.h

@@ -16,20 +16,8 @@
 #define APIC_VERBOSE 1
 #define APIC_VERBOSE 1
 #define APIC_DEBUG   2
 #define APIC_DEBUG   2
 
 
-extern int enable_local_apic;
 extern int apic_verbosity;
 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
  * Define the default level of output to be very little
  * This can be turned up by using apic=verbose for more
  * This can be turned up by using apic=verbose for more