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, 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
 }