From 6a4040b2eaa275807e8ba7a29210f648473360df Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 20 May 2009 00:37:40 -0700 Subject: [PATCH] --- yaml --- r: 145647 b: refs/heads/master c: abfe0af9813153bae8c85d9bac966bafcb8ddab1 h: refs/heads/master i: 145645: 1320ffab8c76e8af52d5c953bc928b42463e1d22 145643: a62a98fc8226ba9b9f04fd25f989da4f3b8389f9 145639: 35c5563b96b618d2aeecea419df8890e83836060 145631: 7565880f70ea0c077af01d74ba373df41998200a v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/mpspec.h | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d3b4cb708072..29ae0adff05f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 948cd52906baf1f92aeea2f9b5c515db1b2e592a +refs/heads/master: abfe0af9813153bae8c85d9bac966bafcb8ddab1 diff --git a/trunk/arch/x86/include/asm/mpspec.h b/trunk/arch/x86/include/asm/mpspec.h index 3dcbaaaa363e..e2a1bb6d71ea 100644 --- a/trunk/arch/x86/include/asm/mpspec.h +++ b/trunk/arch/x86/include/asm/mpspec.h @@ -61,9 +61,11 @@ extern void get_smp_config(void); #ifdef CONFIG_X86_MPPARSE extern void find_smp_config(void); extern void early_reserve_e820_mpc_new(void); +extern int enable_update_mptable; #else static inline void find_smp_config(void) { } static inline void early_reserve_e820_mpc_new(void) { } +#define enable_update_mptable 0 #endif void __cpuinit generic_processor_info(int apicid, int version); @@ -87,15 +89,6 @@ static inline int acpi_probe_gsi(void) } #endif /* CONFIG_ACPI */ -#ifdef CONFIG_X86_MPPARSE -extern int enable_update_mptable; -#else -static inline int enable_update_mptable(void) -{ - return 0; -} -#endif - #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS) struct physid_mask {