diff options
| author |   travis@sgi.com <travis@sgi.com> | 2008-01-30 13:32:53 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:53 +0100 |
| commit | 3334052a321aca0ffecb54244d666311f98f5487 (patch) | |
| tree | 7fc7cd4b99a4e5cfe5eee95fc43f55e126d7ee43 /include/asm-x86/percpu_64.h | |
| parent | x86: use generic percpu on 64-bit (diff) | |
| download | linux-dev-3334052a321aca0ffecb54244d666311f98f5487.tar.xz linux-dev-3334052a321aca0ffecb54244d666311f98f5487.zip | |
x86: unify percpu.h
Form a single percpu.h from percpu_32.h and percpu_64.h. Both are now pretty
small so this is simply adding them together.
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
| -rw-r--r-- | include/asm-x86/percpu_64.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/include/asm-x86/percpu_64.h b/include/asm-x86/percpu_64.h deleted file mode 100644 index e7f3f6d21759..000000000000 --- a/include/asm-x86/percpu_64.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _ASM_X8664_PERCPU_H_ -#define _ASM_X8664_PERCPU_H_ -#include <linux/compiler.h> - -/* Same as asm-generic/percpu.h, except that we store the per cpu offset - in the PDA. Longer term the PDA and every per cpu variable - should be just put into a single section and referenced directly - from %gs */ - -#ifdef CONFIG_SMP - -#include <asm/pda.h> - -#define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset) -#define __my_cpu_offset read_pda(data_offset) - -#define per_cpu_offset(x) (__per_cpu_offset(x)) - -/* A macro to avoid #include hell... */ -#define percpu_modcopy(pcpudst, src, size) \ -do { \ - unsigned int __i; \ - for_each_possible_cpu(__i) \ - memcpy((pcpudst)+__per_cpu_offset(__i), \ - (src), (size)); \ -} while (0) - -#endif /* SMP */ - -#include <asm-generic/percpu.h> - -#endif /* _ASM_X8664_PERCPU_H_ */ |