diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 08:52:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 08:52:14 +0100 |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /arch/x86/include/asm/ds.h | |
| parent | genirq: warn when IRQF_DISABLED may be ignored (diff) | |
| parent | Linux 2.6.28-rc7 (diff) | |
| download | linux-cb9c34e6d090d376b77becaa5d29a65dec7f4272.tar.xz linux-cb9c34e6d090d376b77becaa5d29a65dec7f4272.zip | |
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'arch/x86/include/asm/ds.h')
| -rw-r--r-- | arch/x86/include/asm/ds.h | 6 |
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 */ |