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, 10 insertions, 11 deletions

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 58738c8d754f..1474c18fb777 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -176,17 +176,6 @@ SECTIONS
 
         _end = . ;
 
-        /* Sections to be discarded */
-        /DISCARD/ : {
-                *(.exitcall.exit)
-
-                /* ABI crap starts here */
-                *(.MIPS.options)
-                *(.options)
-                *(.pdr)
-                *(.reginfo)
-        }
-
         /* These mark the ABI of the kernel for debuggers.  */
         .mdebug.abi32 : {
                 KEEP(*(.mdebug.abi32))
@@ -212,4 +201,14 @@ SECTIONS
                 *(.gptab.bss)
                 *(.gptab.sbss)
         }
+
+        /* Sections to be discarded */
+        DISCARDS
+        /DISCARD/ : {
+                /* ABI crap starts here */
+                *(.MIPS.options)
+                *(.options)
+                *(.pdr)
+                *(.reginfo)
+        }
 }