diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-01-30 13:33:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:01 +0100 |
| commit | 2a6648e65a2939b80c44262975176a15bac3a75e (patch) | |
| tree | 4c169dd3d1f78676bb65981dab0e80ed2a238c1e | |
| parent | 1017579a8c6ad6f32154e41ddfdf96d1efbb21b4 (diff) | |
x86: <asm/segment.h>: boot GDT entries are 32/64-independent
The boot GDT entries are common between 32- and 64-bit mode, so move
them to common code instead of having two identical copies.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/asm-x86/segment.h | 24 | ||||
| -rw-r--r-- | include/asm-x86/segment_32.h | 1 |
2 files changed, 8 insertions, 17 deletions
diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h index c7509df79141..1ff05a9f5513 100644 --- a/include/asm-x86/segment.h +++ b/include/asm-x86/segment.h @@ -1,6 +1,14 @@ #ifndef _ASM_X86_SEGMENT_H_ #define _ASM_X86_SEGMENT_H_ +/* Simple and small GDT entries for booting only */ + +#define GDT_ENTRY_BOOT_CS 2 +#define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) + +#define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) +#define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) + #ifdef CONFIG_X86_32 /* * The layout of the per-CPU GDT under Linux: @@ -86,14 +94,6 @@ */ #define GDT_ENTRIES 32 -/* Simple and small GDT entries for booting only */ - -#define GDT_ENTRY_BOOT_CS 2 -#define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) - -#define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) -#define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) - /* The PnP BIOS entries in the GDT */ #define GDT_ENTRY_PNPBIOS_CS32 (GDT_ENTRY_PNPBIOS_BASE + 0) #define GDT_ENTRY_PNPBIOS_CS16 (GDT_ENTRY_PNPBIOS_BASE + 1) @@ -136,14 +136,6 @@ #else #include <asm/cache.h> -/* Simple and small GDT entries for booting only */ - -#define GDT_ENTRY_BOOT_CS 2 -#define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) - -#define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) -#define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) - #define __KERNEL_CS 0x10 #define __KERNEL_DS 0x18 diff --git a/include/asm-x86/segment_32.h b/include/asm-x86/segment_32.h deleted file mode 100644 index 8b137891791f..000000000000 --- a/include/asm-x86/segment_32.h +++ /dev/null @@ -1 +0,0 @@ - |