Merge branch 'linus'

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index e0b7c632efbc..3debc2e26542 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -450,7 +450,6 @@ int_msg:
 
 .globl boot_gdt_descr
 .globl idt_descr
-.globl cpu_gdt_descr
 
         ALIGN
 # early boot GDT descriptor (must use 1:1 address mapping)
@@ -470,8 +469,6 @@ cpu_gdt_descr:
         .word GDT_ENTRIES*8-1
         .long cpu_gdt_table
 
-        .fill NR_CPUS-1,8,0             # space for the other GDT descriptors
-
 /*
  * The boot_gdt_table must mirror the equivalent in setup.S and is
  * used only for booting.
@@ -485,7 +482,7 @@ ENTRY(boot_gdt_table)
 /*
  * The Global Descriptor Table contains 28 quadwords, per-CPU.
  */
-        .align PAGE_SIZE_asm
+        .align L1_CACHE_BYTES
 ENTRY(cpu_gdt_table)
         .quad 0x0000000000000000        /* NULL descriptor */
         .quad 0x0000000000000000        /* 0x0b reserved */