diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:12:55 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:12:55 -0500 |
| commit | 6a385db5ce7f1fd2c68ec511e44587b67dab8fca (patch) | |
| tree | 9324c8ae6f7be54b9fdbd6b60f759292aa727b1f /arch/ia64/kernel/vmlinux.lds.S | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | 4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff) | |
Merge branch 'core/percpu' into x86/core
Conflicts:
kernel/irq/handle.c
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 10a7d47e8510..f45e4e508eca 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 = .; |