diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:30:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:30:23 +0100 |
| commit | 65a37b29a8d7492f081d4f8da2227467af1c0c1d (patch) | |
| tree | 7d1121df648e8e692767034dbf979342623a6aed /arch/ia64 | |
| parent | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (diff) | |
| parent | 60db56422043aaa455ac7f858ce23c273220f9d9 (diff) | |
| download | kernel_samsung_smdk4412-65a37b29a8d7492f081d4f8da2227467af1c0c1d.zip kernel_samsung_smdk4412-65a37b29a8d7492f081d4f8da2227467af1c0c1d.tar.gz kernel_samsung_smdk4412-65a37b29a8d7492f081d4f8da2227467af1c0c1d.tar.bz2 | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index f45e4e5..3765efc 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S @@ -213,17 +213,9 @@ SECTIONS { *(.data.cacheline_aligned) } /* Per-cpu data: */ - percpu : { } :percpu . = ALIGN(PERCPU_PAGE_SIZE); - __phys_per_cpu_start = .; - .data.percpu PERCPU_ADDR : AT(__phys_per_cpu_start - LOAD_OFFSET) - { - __per_cpu_start = .; - *(.data.percpu.page_aligned) - *(.data.percpu) - *(.data.percpu.shared_aligned) - __per_cpu_end = .; - } + PERCPU_VADDR(PERCPU_ADDR, :percpu) + __phys_per_cpu_start = __per_cpu_load; . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ |