diff options
Diffstat (limited to 'include')
| -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 @@ | |||
| 1 | #ifndef _ASM_X86_SEGMENT_H_ | 1 | #ifndef _ASM_X86_SEGMENT_H_ |
| 2 | #define _ASM_X86_SEGMENT_H_ | 2 | #define _ASM_X86_SEGMENT_H_ |
| 3 | 3 | ||
| 4 | /* Simple and small GDT entries for booting only */ | ||
| 5 | |||
| 6 | #define GDT_ENTRY_BOOT_CS 2 | ||
| 7 | #define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) | ||
| 8 | |||
| 9 | #define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) | ||
| 10 | #define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) | ||
| 11 | |||
| 4 | #ifdef CONFIG_X86_32 | 12 | #ifdef CONFIG_X86_32 |
| 5 | /* | 13 | /* |
| 6 | * The layout of the per-CPU GDT under Linux: | 14 | * The layout of the per-CPU GDT under Linux: |
| @@ -86,14 +94,6 @@ | |||
| 86 | */ | 94 | */ |
| 87 | #define GDT_ENTRIES 32 | 95 | #define GDT_ENTRIES 32 |
| 88 | 96 | ||
| 89 | /* Simple and small GDT entries for booting only */ | ||
| 90 | |||
| 91 | #define GDT_ENTRY_BOOT_CS 2 | ||
| 92 | #define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) | ||
| 93 | |||
| 94 | #define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) | ||
| 95 | #define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) | ||
| 96 | |||
| 97 | /* The PnP BIOS entries in the GDT */ | 97 | /* The PnP BIOS entries in the GDT */ |
| 98 | #define GDT_ENTRY_PNPBIOS_CS32 (GDT_ENTRY_PNPBIOS_BASE + 0) | 98 | #define GDT_ENTRY_PNPBIOS_CS32 (GDT_ENTRY_PNPBIOS_BASE + 0) |
| 99 | #define GDT_ENTRY_PNPBIOS_CS16 (GDT_ENTRY_PNPBIOS_BASE + 1) | 99 | #define GDT_ENTRY_PNPBIOS_CS16 (GDT_ENTRY_PNPBIOS_BASE + 1) |
| @@ -136,14 +136,6 @@ | |||
| 136 | #else | 136 | #else |
| 137 | #include <asm/cache.h> | 137 | #include <asm/cache.h> |
| 138 | 138 | ||
| 139 | /* Simple and small GDT entries for booting only */ | ||
| 140 | |||
| 141 | #define GDT_ENTRY_BOOT_CS 2 | ||
| 142 | #define __BOOT_CS (GDT_ENTRY_BOOT_CS * 8) | ||
| 143 | |||
| 144 | #define GDT_ENTRY_BOOT_DS (GDT_ENTRY_BOOT_CS + 1) | ||
| 145 | #define __BOOT_DS (GDT_ENTRY_BOOT_DS * 8) | ||
| 146 | |||
| 147 | #define __KERNEL_CS 0x10 | 139 | #define __KERNEL_CS 0x10 |
| 148 | #define __KERNEL_DS 0x18 | 140 | #define __KERNEL_DS 0x18 |
| 149 | 141 | ||
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 @@ | |||
| 1 | |||