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, 3 insertions, 6 deletions

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index a53db23ee092..82415c75b996 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -157,13 +157,10 @@ SECTIONS
 
         _end = . ;
 
-        /* Sections to be discarded */
-        /DISCARD/ : {
-                EXIT_DATA
-                *(.exitcall.exit)
-        }
-
         /* Debugging sections.  */
         STABS_DEBUG
         DWARF_DEBUG
+
+        /* Sections to be discarded */
+        DISCARDS
 }