aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/head.S
diff options
context:
space:
mode:
authorSebastien Dugue <sebastien.dugue@bull.net>2007-05-02 13:27:10 -0400
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 13:27:10 -0400
commit52de74dd3994e165ef1b35c33d54655a6400e30c (patch)
tree3a8f43f49826b637864e019bcb66f4c09dc6d0e5 /arch/i386/kernel/head.S
parentd2cbcc49e2bfd6eaa44d7e4e5e5f171aaa5ec80d (diff)
[PATCH] i386: Rename boot_gdt_table to boot_gdt
Rename boot_gdt_table to boot_gdt to avoid the duplicate T(able). Signed-off-by: Sebastien Dugue <sebastien.dugue@bull.net> Signed-off-by: Andi Kleen <ak@suse.de> Acked-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/head.S')
-rw-r--r--arch/i386/kernel/head.S9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index 633fd2f47429..cc46494787e8 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -147,8 +147,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
147/* 147/*
148 * Non-boot CPU entry point; entered from trampoline.S 148 * Non-boot CPU entry point; entered from trampoline.S
149 * We can't lgdt here, because lgdt itself uses a data segment, but 149 * We can't lgdt here, because lgdt itself uses a data segment, but
150 * we know the trampoline has already loaded the boot_gdt_table GDT 150 * we know the trampoline has already loaded the boot_gdt for us.
151 * for us.
152 * 151 *
153 * If cpu hotplug is not supported then this code can go in init section 152 * If cpu hotplug is not supported then this code can go in init section
154 * which will be freed later 153 * which will be freed later
@@ -588,7 +587,7 @@ fault_msg:
588 .word 0 # 32 bit align gdt_desc.address 587 .word 0 # 32 bit align gdt_desc.address
589boot_gdt_descr: 588boot_gdt_descr:
590 .word __BOOT_DS+7 589 .word __BOOT_DS+7
591 .long boot_gdt_table - __PAGE_OFFSET 590 .long boot_gdt - __PAGE_OFFSET
592 591
593 .word 0 # 32-bit align idt_desc.address 592 .word 0 # 32-bit align idt_desc.address
594idt_descr: 593idt_descr:
@@ -602,11 +601,11 @@ ENTRY(early_gdt_descr)
602 .long per_cpu__cpu_gdt /* Overwritten for secondary CPUs */ 601 .long per_cpu__cpu_gdt /* Overwritten for secondary CPUs */
603 602
604/* 603/*
605 * The boot_gdt_table must mirror the equivalent in setup.S and is 604 * The boot_gdt must mirror the equivalent in setup.S and is
606 * used only for booting. 605 * used only for booting.
607 */ 606 */
608 .align L1_CACHE_BYTES 607 .align L1_CACHE_BYTES
609ENTRY(boot_gdt_table) 608ENTRY(boot_gdt)
610 .fill GDT_ENTRY_BOOT_CS,8,0 609 .fill GDT_ENTRY_BOOT_CS,8,0
611 .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */ 610 .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
612 .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */ 611 .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */