summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarkus Metzger <markus.t.metzger@intel.com>2008-11-25 08:47:19 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-25 17:28:51 +0100
commite5e8ca633bbe972eff6f84e064a63c0c08ed6c3d (patch)
tree8e0cd2f37a87ada15b87983f33b84c95e383956e /arch
parentx86, bts: exclude ds.c from build when disabled (diff)
downloadlinux-e5e8ca633bbe972eff6f84e064a63c0c08ed6c3d.tar.xz
linux-e5e8ca633bbe972eff6f84e064a63c0c08ed6c3d.zip
x86, bts: turn macro into static inline function
Impact: cleanup Replace a macro with a static inline function. Signed-off-by: Markus Metzger <markus.t.metzger@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/ds.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/ds.h b/arch/x86/include/asm/ds.h
index 72c5a190bf48..a95008457ea4 100644
--- a/arch/x86/include/asm/ds.h
+++ b/arch/x86/include/asm/ds.h
@@ -23,12 +23,13 @@
#ifndef _ASM_X86_DS_H
#define _ASM_X86_DS_H
-#ifdef CONFIG_X86_DS
#include <linux/types.h>
#include <linux/init.h>
+#ifdef CONFIG_X86_DS
+
struct task_struct;
/*
@@ -232,7 +233,8 @@ extern void ds_free(struct ds_context *context);
#else /* CONFIG_X86_DS */
-#define ds_init_intel(config) do {} while (0)
+struct cpuinfo_x86;
+static inline void __cpuinit ds_init_intel(struct cpuinfo_x86 *ignored) {}
#endif /* CONFIG_X86_DS */
#endif /* _ASM_X86_DS_H */