From: "Jan Beulich" With cpu_gdt_descr having been converted to per-CPU data, the old object (in head.S) no longer needs to reserve space for each CPU's instance. With cpu_gdt_table not being used for CPU 0 anymore, it doesn't seem to need page alignment (or if in fact there is a need for it to retain that alignment, the whole object should go into .data.page_align). Signed-off-by: Jan Beulich Cc: Zachary Amsden Signed-off-by: Andrew Morton --- arch/i386/kernel/head.S | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) diff -puN arch/i386/kernel/head.S~i386-cleanup-after-cpu_gdt_descr-conversion-to arch/i386/kernel/head.S --- devel/arch/i386/kernel/head.S~i386-cleanup-after-cpu_gdt_descr-conversion-to 2006-03-04 22:17:37.000000000 -0800 +++ devel-akpm/arch/i386/kernel/head.S 2006-03-04 22:17:37.000000000 -0800 @@ -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 */ _