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

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 43a87b9085b6..662b02ecb86e 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -152,9 +152,6 @@ SECTIONS
         __end = . ;
         __ramstart = .;
         }
-        /DISCARD/ : {
-                *(.exitcall.exit)
-        }
         .romfs :        
         {
                 *(.romfs*)
@@ -165,4 +162,6 @@ SECTIONS
         COMMAND_START = . - 0x200 ;
         __ramend = . ;
         }
+
+        DISCARDS
 }