summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-05 09:24:30 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-05 09:24:30 +0200
commitd3d0ba7b8fb8f57c33207adcb41f40c176148c03 (patch)
tree39a93460aa2c6eb8286fbba6c551f95443e175dd /include/asm-generic
parent9042763808c5285a1a61b45b0fe98a710a4c903c (diff)
parent63cc8c75156462d4b42cbdd76c293b7eee7ddbfe (diff)
downloadlinux-d3d0ba7b8fb8f57c33207adcb41f40c176148c03.tar.gz
linux-d3d0ba7b8fb8f57c33207adcb41f40c176148c03.tar.bz2
linux-d3d0ba7b8fb8f57c33207adcb41f40c176148c03.zip
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
"percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro" into x86/core Conflicts: arch/x86/kernel/cpu/common.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index cb752ba72466..7440a0dceddb 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -385,6 +385,7 @@
. = ALIGN(align); \
VMLINUX_SYMBOL(__per_cpu_start) = .; \
.data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \
+ *(.data.percpu.page_aligned) \
*(.data.percpu) \
*(.data.percpu.shared_aligned) \
} \