projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/debug' into x86/irq
[linux-2.6]
/
arch
/
ia64
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/ia64/kernel/vmlinux.lds.S
b/arch/ia64/kernel/vmlinux.lds.S
index
5a77206
..
10a7d47
100644
(file)
--- a/
arch/ia64/kernel/vmlinux.lds.S
+++ b/
arch/ia64/kernel/vmlinux.lds.S
@@
-230,6
+230,11
@@
SECTIONS
data : { } :data
.data : AT(ADDR(.data) - LOAD_OFFSET)
{
+#ifdef CONFIG_SMP
+ . = ALIGN(PERCPU_PAGE_SIZE);
+ __cpu0_per_cpu = .;
+ . = . + PERCPU_PAGE_SIZE; /* cpu0 per-cpu space */
+#endif
DATA_DATA
*(.data1)
*(.gnu.linkonce.d*)