diff options
| author | James Morris | 2008-12-04 07:16:36 +0100 |
|---|---|---|
| committer | James Morris | 2008-12-04 07:16:36 +0100 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /arch/x86/include/asm/ds.h | |
| parent | Merge branch 'serge-next' into next (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | kernel-qcow2-linux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.gz kernel-qcow2-linux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.xz kernel-qcow2-linux-ec98ce480ada787f2cfbd696980ff3564415505b.zip | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
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 */ |