diff options
| author |   Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/frv | |
| parent | percpu: don't assume existence of cpu0 (diff) | |
| parent | powerpc64: convert to dynamic percpu allocator (diff) | |
| download | linux-dev-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.xz linux-dev-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/frv')
| -rw-r--r-- | arch/frv/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index 22d9787406ed..7dbf41f68b52 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S @@ -177,6 +177,8 @@ SECTIONS .debug_ranges 0 : { *(.debug_ranges) } .comment 0 : { *(.comment) } + + DISCARDS } __kernel_image_size_no_bss = __bss_start - __kernel_image_start; |