Merge branch 'linus' into x86/quirks

2 files changed, 3 insertions, 2 deletions

diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S
index 40180778a5c7..90916067b9c1 100644
--- a/arch/m32r/kernel/head.S
+++ b/arch/m32r/kernel/head.S
@@ -23,7 +23,7 @@ __INITDATA
 /*
  * References to members of the boot_cpu_data structure.
  */
-        .text
+.section .text.head, "ax"
         .global start_kernel
         .global __bss_start
         .global _end
@@ -133,7 +133,6 @@ loop1:
 /*
  * AP startup routine
  */
-        .text
         .global eit_vector
 ENTRY(startup_AP)
 ;; setup EVB
@@ -230,6 +229,7 @@ ENTRY(startup_AP)
         nop
 #endif  /* CONFIG_SMP */
 
+        .text
 ENTRY(stack_start)
         .long   init_thread_union+8192
         .long   __KERNEL_DS
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 15a6f36c06db..9db05df20c0e 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -27,6 +27,7 @@ SECTIONS
   _text = .;                    /* Text and read-only data */
   .boot : { *(.boot) } = 0
   .text : {
+        *(.text.head)
         TEXT_TEXT
         SCHED_TEXT
         LOCK_TEXT