From 78d0a05ad42f9d082fed88c77e1328221d11f76c Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 23 Mar 2006 02:59:51 -0800 Subject: [PATCH] --- yaml --- r: 23005 b: refs/heads/master c: 4ef0652a74d9c460299b00566d033bd45d60da98 h: refs/heads/master i: 23003: e0d8477adfc6cd9fad168f68a45627d981ad6dbe v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/head.S | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a8ddfc14236..f02cdec3cab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52f4a91afd9316fb4f0f3a77c5ff56b9c98632ea +refs/heads/master: 4ef0652a74d9c460299b00566d033bd45d60da98 diff --git a/trunk/arch/i386/kernel/head.S b/trunk/arch/i386/kernel/head.S index e0b7c632efbc..3debc2e26542 100644 --- a/trunk/arch/i386/kernel/head.S +++ b/trunk/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 */