From 64ed17088c0fb22a4fc1aae756ccac1631e8537d Mon Sep 17 00:00:00 2001
From: Markus Metzger <markus.t.metzger@intel.com>
Date: Tue, 25 Nov 2008 08:47:19 +0100
Subject: [PATCH] --- yaml --- r: 119408 b: refs/heads/master c:
 e5e8ca633bbe972eff6f84e064a63c0c08ed6c3d h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/include/asm/ds.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f5c57e5d68d2..3de19d5d09fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 292c669cd7087a090d6420e223eb1072f3e3c50b
+refs/heads/master: e5e8ca633bbe972eff6f84e064a63c0c08ed6c3d
diff --git a/trunk/arch/x86/include/asm/ds.h b/trunk/arch/x86/include/asm/ds.h
index 72c5a190bf48..a95008457ea4 100644
--- a/trunk/arch/x86/include/asm/ds.h
+++ b/trunk/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 */