diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:29:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:29:06 -0500 |
| commit | ea9b395fe20ac74be788f415af2622ac8f0c35c7 (patch) | |
| tree | d1653e1a4cbe360aa7132ea4e29ab92a02038224 /include/asm-x86_64/segment.h | |
| parent | 61420e147a706ee7c7a902008045547fb2a2a330 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-x86_64/segment.h')
| -rw-r--r-- | include/asm-x86_64/segment.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86_64/segment.h b/include/asm-x86_64/segment.h index 44adaf18c11..d4bed33fb32 100644 --- a/include/asm-x86_64/segment.h +++ b/include/asm-x86_64/segment.h @@ -19,15 +19,13 @@ #define __USER_DS 0x2b /* 5*8+3 */ #define __USER_CS 0x33 /* 6*8+3 */ #define __USER32_DS __USER_DS -#define __KERNEL16_CS (GDT_ENTRY_KERNELCS16 * 8) -#define __KERNEL_COMPAT32_CS 0x8 #define GDT_ENTRY_TLS 1 #define GDT_ENTRY_TSS 8 /* needs two entries */ #define GDT_ENTRY_LDT 10 /* needs two entries */ #define GDT_ENTRY_TLS_MIN 12 #define GDT_ENTRY_TLS_MAX 14 -#define GDT_ENTRY_KERNELCS16 15 +/* 15 free */ #define GDT_ENTRY_TLS_ENTRIES 3 |