diff options
| author |   Sebastien Dugue <sebastien.dugue@bull.net> | 2007-05-02 19:27:10 +0200 |
|---|---|---|
| committer |   Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:10 +0200 |
| commit | 52de74dd3994e165ef1b35c33d54655a6400e30c (patch) | |
| tree | 3a8f43f49826b637864e019bcb66f4c09dc6d0e5 /arch/i386/kernel/trampoline.S | |
| parent | [PATCH] i386: clean up cpu_init() (diff) | |
| download | linux-dev-52de74dd3994e165ef1b35c33d54655a6400e30c.tar.xz linux-dev-52de74dd3994e165ef1b35c33d54655a6400e30c.zip | |
[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 '')
| -rw-r--r-- | arch/i386/kernel/trampoline.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/i386/kernel/trampoline.S b/arch/i386/kernel/trampoline.S index 2f1814c5cfd7..f62815f8d06a 100644 --- a/arch/i386/kernel/trampoline.S +++ b/arch/i386/kernel/trampoline.S @@ -29,7 +29,7 @@ * * TYPE VALUE * R_386_32 startup_32_smp - * R_386_32 boot_gdt_table + * R_386_32 boot_gdt */ #include <linux/linkage.h> @@ -62,8 +62,8 @@ r_base = . * to 32 bit. */ - lidtl boot_idt - r_base # load idt with 0, 0 - lgdtl boot_gdt - r_base # load gdt with whatever is appropriate + lidtl boot_idt_descr - r_base # load idt with 0, 0 + lgdtl boot_gdt_descr - r_base # load gdt with whatever is appropriate xor %ax, %ax inc %ax # protected mode (PE) bit @@ -73,11 +73,11 @@ r_base = . # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -boot_gdt: +boot_gdt_descr: .word __BOOT_DS + 7 # gdt limit - .long boot_gdt_table-__PAGE_OFFSET # gdt base + .long boot_gdt - __PAGE_OFFSET # gdt base -boot_idt: +boot_idt_descr: .word 0 # idt limit = 0 .long 0 # idt base = 0L |