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

1 files changed, 4 insertions, 6 deletions

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index f53c76acaede..0ce254bca92f 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -163,16 +163,14 @@ SECTIONS
                 _end = . ;
         }
 
+        STABS_DEBUG
+        DWARF_DEBUG
+
         /*
          * When something in the kernel is NOT compiled as a module, the
          * module cleanup code and data are put into these segments. Both
          * can then be thrown away, as cleanup code is never called unless
          * it's a module.
          */
-        /DISCARD/ : {
-                *(.exitcall.exit)
-        }
-
-        STABS_DEBUG
-        DWARF_DEBUG
+        DISCARDS
 }