lkml.org 
[lkml]   [2009]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
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@kernel.org>
AuthorDate: Wed, 20 May 2009 00:37:40 -0700
Committer: Ingo Molnar <mingo@elte.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@kernel.org>
LKML-Reference: <4A13B344.7030307@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.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 {

\
 
 \ /
  Last update: 2009-05-28 02:03    [W:0.098 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site