diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /arch/ia64/kernel/vmlinux.lds.S | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'arch/ia64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 10a7d47e851..f45e4e508ec 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
| @@ -219,6 +219,7 @@ SECTIONS | |||
| 219 | .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) | 219 | .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) |
| 220 | { | 220 | { |
| 221 | __per_cpu_start = .; | 221 | __per_cpu_start = .; |
| 222 | *(.data.percpu.page_aligned) | ||
| 222 | *(.data.percpu) | 223 | *(.data.percpu) |
| 223 | *(.data.percpu.shared_aligned) | 224 | *(.data.percpu.shared_aligned) |
| 224 | __per_cpu_end = .; | 225 | __per_cpu_end = .; |