[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-abfe0af9813153bae8c85d9bac966bafcb8ddab1@git.kernel.org>
Date: Thu, 28 May 2009 00:00:31 GMT
From: tip-bot for Yinghai Lu <yinghai@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:irq/numa] x86: enable_update_mptable should be a macro
Commit-ID: abfe0af9813153bae8c85d9bac966bafcb8ddab1
Gitweb: http://git.kernel.org/tip/abfe0af9813153bae8c85d9bac966bafcb8ddab1
Author: Yinghai Lu <yinghai@...nel.org>
AuthorDate: Wed, 20 May 2009 00:37:40 -0700
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 28 May 2009 01:59:05 +0200
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@...nel.org>
LKML-Reference: <4A13B344.7030307@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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 3dcbaaa..e2a1bb6 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);
#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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists