diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-09-26 10:52:35 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:35 +0200 |
| commit | 3d08a256da8aed5300bd0752200ece426f49b050 (patch) | |
| tree | 26c7d5362b440fc0b855ff9b6ccace795125b309 | |
| parent | e8924acb2ef46b96c93f97025815ef3843cb67a2 (diff) | |
[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>
| -rw-r--r-- | arch/i386/kernel/apic.c | 13 | ||||
| -rw-r--r-- | include/asm-i386/apic.h | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index ce75e71b694..90faae5c5d3 100644 --- a/arch/i386/kernel/apic.c +++ b/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/include/asm-i386/apic.h b/include/asm-i386/apic.h index 8c5331ceca7..3a42b7d6fc9 100644 --- a/include/asm-i386/apic.h +++ b/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 |