aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 22:46:24 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:05:01 -0800
commitcdc4b9c01909d606afbc1e4a4b6c21fa1687a016 (patch)
tree4c4c7191509f6527cc3813af1ee92f07bea0bbed /arch
parent[PATCH] x86_64: ioapic virtual wire mode fix (diff)
downloadlinux-dev-cdc4b9c01909d606afbc1e4a4b6c21fa1687a016.tar.xz
linux-dev-cdc4b9c01909d606afbc1e4a4b6c21fa1687a016.zip
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/head.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S
index 1d216a9fc6d8..38fc3d5112e7 100644
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head.S
@@ -386,7 +386,7 @@ gdt:
ENTRY(cpu_gdt_table)
.quad 0x0000000000000000 /* NULL descriptor */
- .quad 0x008f9a000000ffff /* __KERNEL_COMPAT32_CS */
+ .quad 0x0 /* unused */
.quad 0x00af9a000000ffff /* __KERNEL_CS */
.quad 0x00cf92000000ffff /* __KERNEL_DS */
.quad 0x00cffa000000ffff /* __USER32_CS */
@@ -396,8 +396,7 @@ ENTRY(cpu_gdt_table)
.quad 0,0 /* TSS */
.quad 0,0 /* LDT */
.quad 0,0,0 /* three TLS descriptors */
- .quad 0x00009a000000ffff /* __KERNEL16_CS - 16bit PM for S3 wakeup. */
- /* base must be patched for real base address. */
+ .quad 0 /* unused */
gdt_end:
/* asm/segment.h:GDT_ENTRIES must match this */
/* This should be a multiple of the cache line size */