diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 19:48:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 19:48:53 -0500 |
| commit | 6232665040f9a23fafd9d94d4ae8d5a2dc850f65 (patch) | |
| tree | 21ee1b178d0f96ad9f4932e4da8abccf2fbeae96 /include/linux | |
| parent | 94ed294c20ef07fffa40817c68155fba35dd67f1 (diff) | |
| parent | c18d1250c7425dddd2633ce4eaf03d5015e68a0f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
alpha: fix x86.git merge build error
ia64: on UP percpu variables are not small memory model
x86: fix arch/x86/kernel/test_nx.c modular build bug
s390: use generic percpu linux-2.6.git
POWERPC: use generic per cpu
ia64: use generic percpu
SPARC64: use generic percpu
percpu: change Kconfig to HAVE_SETUP_PER_CPU_AREA
modules: fold percpu_modcopy into module.c
x86: export copy_from_user_ll_nocache[_nozero]
x86: fix duplicated TIF on 64-bit
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/percpu.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 00412bb494c4..50faa0ea28e4 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -9,10 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include <asm/percpu.h> | 10 | #include <asm/percpu.h> |
| 11 | 11 | ||
| 12 | #ifndef PER_CPU_ATTRIBUTES | ||
| 13 | #define PER_CPU_ATTRIBUTES | ||
| 14 | #endif | ||
| 15 | |||
| 16 | #ifdef CONFIG_SMP | 12 | #ifdef CONFIG_SMP |
| 17 | #define DEFINE_PER_CPU(type, name) \ | 13 | #define DEFINE_PER_CPU(type, name) \ |
| 18 | __attribute__((__section__(".data.percpu"))) \ | 14 | __attribute__((__section__(".data.percpu"))) \ |