3 files changed, 5 insertions, 11 deletions

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 7ffec6b3b331..64ad7696786f 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -79,7 +79,7 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
  * any particular GDT layout, because we load our own as soon as we
  * can.
  */
-.section .text.head,"ax",@progbits
+__HEAD
 ENTRY(startup_32)
         /* test KEEP_SEGMENTS flag to see if the bootloader is asking
                 us to not reload segments */
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index fa54f78e2a05..26406601031c 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -40,7 +40,7 @@ L4_START_KERNEL = pgd_index(__START_KERNEL_map)
 L3_START_KERNEL = pud_index(__START_KERNEL_map)
 
         .text
-        .section .text.head
+        __HEAD
         .code64
         .globl startup_64
 startup_64:
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index b96ca472fa26..5c7826dd804b 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -65,17 +65,11 @@ SECTIONS
 #endif
 
         /* Text and read-only data */
-
-        /* bootstrapping code */
-        .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
-                _text = .;
-                *(.text.head)
-        } :text = 0x9090
-
-        /* The rest of the text */
         .text :  AT(ADDR(.text) - LOAD_OFFSET) {
+                _text = .;
+                /* bootstrapping code */
+                HEAD_TEXT
 #ifdef CONFIG_X86_32
-                /* not really needed, already page aligned */
                 . = ALIGN(PAGE_SIZE);
                 *(.text.page_aligned)
 #endif