diff options
| author | Tejun Heo | 2009-09-15 02:57:19 +0200 |
|---|---|---|
| committer | Tejun Heo | 2009-09-15 02:57:19 +0200 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/m32r/kernel | |
| parent | percpu: don't assume existence of cpu0 (diff) | |
| parent | powerpc64: convert to dynamic percpu allocator (diff) | |
| download | kernel-qcow2-linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.gz kernel-qcow2-linux-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz kernel-qcow2-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/m32r/kernel')
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 4179adf6c624..de5e21cca6a5 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S @@ -120,13 +120,6 @@ SECTIONS _end = . ; - /* Sections to be discarded */ - /DISCARD/ : { - EXIT_TEXT - EXIT_DATA - *(.exitcall.exit) - } - /* Stabs debugging sections. */ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } @@ -135,4 +128,7 @@ SECTIONS .stab.index 0 : { *(.stab.index) } .stab.indexstr 0 : { *(.stab.indexstr) } .comment 0 : { *(.comment) } + + /* Sections to be discarded */ + DISCARDS } |