diff options
author | Tejun Heo <tj@kernel.org> | 2009-09-15 02:57:19 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-09-15 02:57:19 +0200 |
commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/h8300 | |
parent | percpu: don't assume existence of cpu0 (diff) | |
parent | powerpc64: convert to dynamic percpu allocator (diff) | |
download | linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'arch/h8300')
-rw-r--r-- | arch/h8300/kernel/vmlinux.lds.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S index 43a87b9085b6..662b02ecb86e 100644 --- a/arch/h8300/kernel/vmlinux.lds.S +++ b/arch/h8300/kernel/vmlinux.lds.S @@ -152,9 +152,6 @@ SECTIONS __end = . ; __ramstart = .; } - /DISCARD/ : { - *(.exitcall.exit) - } .romfs : { *(.romfs*) @@ -165,4 +162,6 @@ SECTIONS COMMAND_START = . - 0x200 ; __ramend = . ; } + + DISCARDS } |