diff options
Diffstat (limited to 'arch/ia64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index de71da811cd6..10a7d47e8510 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
| @@ -215,9 +215,6 @@ SECTIONS | |||
| 215 | /* Per-cpu data: */ | 215 | /* Per-cpu data: */ |
| 216 | percpu : { } :percpu | 216 | percpu : { } :percpu |
| 217 | . = ALIGN(PERCPU_PAGE_SIZE); | 217 | . = ALIGN(PERCPU_PAGE_SIZE); |
| 218 | #ifdef CONFIG_SMP | ||
| 219 | . = . + PERCPU_PAGE_SIZE; /* cpu0 per-cpu space */ | ||
| 220 | #endif | ||
| 221 | __phys_per_cpu_start = .; | 218 | __phys_per_cpu_start = .; |
| 222 | .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) | 219 | .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) |
| 223 | { | 220 | { |
| @@ -233,6 +230,11 @@ SECTIONS | |||
| 233 | data : { } :data | 230 | data : { } :data |
| 234 | .data : AT(ADDR(.data) - LOAD_OFFSET) | 231 | .data : AT(ADDR(.data) - LOAD_OFFSET) |
| 235 | { | 232 | { |
| 233 | #ifdef CONFIG_SMP | ||
| 234 | . = ALIGN(PERCPU_PAGE_SIZE); | ||
| 235 | __cpu0_per_cpu = .; | ||
| 236 | . = . + PERCPU_PAGE_SIZE; /* cpu0 per-cpu space */ | ||
| 237 | #endif | ||
| 236 | DATA_DATA | 238 | DATA_DATA |
| 237 | *(.data1) | 239 | *(.data1) |
| 238 | *(.gnu.linkonce.d*) | 240 | *(.gnu.linkonce.d*) |
