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/microblaze/kernel/vmlinux.lds.S | |
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/microblaze/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/microblaze/kernel/vmlinux.lds.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/vmlinux.lds.S b/arch/microblaze/kernel/vmlinux.lds.S index d34d38dcd12c..ec5fa91a48d8 100644 --- a/arch/microblaze/kernel/vmlinux.lds.S +++ b/arch/microblaze/kernel/vmlinux.lds.S @@ -23,8 +23,8 @@ SECTIONS { _stext = . ; *(.text .text.*) *(.fixup) - - *(.exitcall.exit) + EXIT_TEXT + EXIT_CALL SCHED_TEXT LOCK_TEXT KPROBES_TEXT @@ -162,4 +162,6 @@ SECTIONS { } . = ALIGN(4096); _end = .; + + DISCARDS } |