Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / head_32.S

diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 8663afb5653547905ecc31bc0ec1d0c41cea2307..7ffec6b3b3316e168f6a15564f2fab7a1bd00bac 100644 (file)
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -261,9 +261,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
  * which will be freed later
  */
 
-#ifndef CONFIG_HOTPLUG_CPU
-.section .init.text,"ax",@progbits
-#endif
+__CPUINIT
 
 #ifdef CONFIG_SMP
 ENTRY(startup_32_smp)
@@ -441,7 +439,6 @@ is386:      movl $2,%ecx            # set MP
        jne 1f
        movl $per_cpu__gdt_page,%eax
        movl $per_cpu__stack_canary,%ecx
-       subl $20, %ecx
        movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
        shrl $16, %ecx
        movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
@@ -602,7 +599,7 @@ ignore_int:
 #endif
        iret
 
-.section .cpuinit.data,"wa"
+       __REFDATA
 .align 4
 ENTRY(initial_code)
        .long i386_start_kernel