diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-05-20 03:37:40 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-27 19:59:05 -0400 |
commit | abfe0af9813153bae8c85d9bac966bafcb8ddab1 (patch) | |
tree | a19a364e427c0db6dad4f2245522ab8afda9e4c9 /arch | |
parent | 948cd52906baf1f92aeea2f9b5c515db1b2e592a (diff) |
x86: enable_update_mptable should be a macro
instead of declaring one variant as an inline function...
because other case is a variable
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4A13B344.7030307@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/mpspec.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 3dcbaaaa363e..e2a1bb6d71ea 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h | |||
@@ -61,9 +61,11 @@ extern void get_smp_config(void); | |||
61 | #ifdef CONFIG_X86_MPPARSE | 61 | #ifdef CONFIG_X86_MPPARSE |
62 | extern void find_smp_config(void); | 62 | extern void find_smp_config(void); |
63 | extern void early_reserve_e820_mpc_new(void); | 63 | extern void early_reserve_e820_mpc_new(void); |
64 | extern int enable_update_mptable; | ||
64 | #else | 65 | #else |
65 | static inline void find_smp_config(void) { } | 66 | static inline void find_smp_config(void) { } |
66 | static inline void early_reserve_e820_mpc_new(void) { } | 67 | static inline void early_reserve_e820_mpc_new(void) { } |
68 | #define enable_update_mptable 0 | ||
67 | #endif | 69 | #endif |
68 | 70 | ||
69 | void __cpuinit generic_processor_info(int apicid, int version); | 71 | void __cpuinit generic_processor_info(int apicid, int version); |
@@ -87,15 +89,6 @@ static inline int acpi_probe_gsi(void) | |||
87 | } | 89 | } |
88 | #endif /* CONFIG_ACPI */ | 90 | #endif /* CONFIG_ACPI */ |
89 | 91 | ||
90 | #ifdef CONFIG_X86_MPPARSE | ||
91 | extern int enable_update_mptable; | ||
92 | #else | ||
93 | static inline int enable_update_mptable(void) | ||
94 | { | ||
95 | return 0; | ||
96 | } | ||
97 | #endif | ||
98 | |||
99 | #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS) | 92 | #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS) |
100 | 93 | ||
101 | struct physid_mask { | 94 | struct physid_mask { |