[PATCH] x86_64: Remove unused segments

They used to be used by the reboot code, but not anymore.

Noticed by Jan Beulich

Cc: JBeulich@novell.com

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Andi Kleen and committed by Linus Torvalds cdc4b9c0 af5b9804

+3 -6
+2 -3
arch/x86_64/kernel/head.S
··· 386 387 ENTRY(cpu_gdt_table) 388 .quad 0x0000000000000000 /* NULL descriptor */ 389 - .quad 0x008f9a000000ffff /* __KERNEL_COMPAT32_CS */ 390 .quad 0x00af9a000000ffff /* __KERNEL_CS */ 391 .quad 0x00cf92000000ffff /* __KERNEL_DS */ 392 .quad 0x00cffa000000ffff /* __USER32_CS */ ··· 396 .quad 0,0 /* TSS */ 397 .quad 0,0 /* LDT */ 398 .quad 0,0,0 /* three TLS descriptors */ 399 - .quad 0x00009a000000ffff /* __KERNEL16_CS - 16bit PM for S3 wakeup. */ 400 - /* base must be patched for real base address. */ 401 gdt_end: 402 /* asm/segment.h:GDT_ENTRIES must match this */ 403 /* This should be a multiple of the cache line size */
··· 386 387 ENTRY(cpu_gdt_table) 388 .quad 0x0000000000000000 /* NULL descriptor */ 389 + .quad 0x0 /* unused */ 390 .quad 0x00af9a000000ffff /* __KERNEL_CS */ 391 .quad 0x00cf92000000ffff /* __KERNEL_DS */ 392 .quad 0x00cffa000000ffff /* __USER32_CS */ ··· 396 .quad 0,0 /* TSS */ 397 .quad 0,0 /* LDT */ 398 .quad 0,0,0 /* three TLS descriptors */ 399 + .quad 0 /* unused */ 400 gdt_end: 401 /* asm/segment.h:GDT_ENTRIES must match this */ 402 /* This should be a multiple of the cache line size */
+1 -3
include/asm-x86_64/segment.h
··· 19 #define __USER_DS 0x2b /* 5*8+3 */ 20 #define __USER_CS 0x33 /* 6*8+3 */ 21 #define __USER32_DS __USER_DS 22 - #define __KERNEL16_CS (GDT_ENTRY_KERNELCS16 * 8) 23 - #define __KERNEL_COMPAT32_CS 0x8 24 25 #define GDT_ENTRY_TLS 1 26 #define GDT_ENTRY_TSS 8 /* needs two entries */ 27 #define GDT_ENTRY_LDT 10 /* needs two entries */ 28 #define GDT_ENTRY_TLS_MIN 12 29 #define GDT_ENTRY_TLS_MAX 14 30 - #define GDT_ENTRY_KERNELCS16 15 31 32 #define GDT_ENTRY_TLS_ENTRIES 3 33
··· 19 #define __USER_DS 0x2b /* 5*8+3 */ 20 #define __USER_CS 0x33 /* 6*8+3 */ 21 #define __USER32_DS __USER_DS 22 23 #define GDT_ENTRY_TLS 1 24 #define GDT_ENTRY_TSS 8 /* needs two entries */ 25 #define GDT_ENTRY_LDT 10 /* needs two entries */ 26 #define GDT_ENTRY_TLS_MIN 12 27 #define GDT_ENTRY_TLS_MAX 14 28 + /* 15 free */ 29 30 #define GDT_ENTRY_TLS_ENTRIES 3 31