diff options
author | Andi Kleen <ak@suse.de> | 2006-01-11 16:46:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:05:01 -0500 |
commit | cdc4b9c01909d606afbc1e4a4b6c21fa1687a016 (patch) | |
tree | 4c4c7191509f6527cc3813af1ee92f07bea0bbed /arch | |
parent | af5b98042452cc6f50de8afa9d079bda8556d74d (diff) |
[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.S | 5 |
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: | |||
386 | 386 | ||
387 | ENTRY(cpu_gdt_table) | 387 | ENTRY(cpu_gdt_table) |
388 | .quad 0x0000000000000000 /* NULL descriptor */ | 388 | .quad 0x0000000000000000 /* NULL descriptor */ |
389 | .quad 0x008f9a000000ffff /* __KERNEL_COMPAT32_CS */ | 389 | .quad 0x0 /* unused */ |
390 | .quad 0x00af9a000000ffff /* __KERNEL_CS */ | 390 | .quad 0x00af9a000000ffff /* __KERNEL_CS */ |
391 | .quad 0x00cf92000000ffff /* __KERNEL_DS */ | 391 | .quad 0x00cf92000000ffff /* __KERNEL_DS */ |
392 | .quad 0x00cffa000000ffff /* __USER32_CS */ | 392 | .quad 0x00cffa000000ffff /* __USER32_CS */ |
@@ -396,8 +396,7 @@ ENTRY(cpu_gdt_table) | |||
396 | .quad 0,0 /* TSS */ | 396 | .quad 0,0 /* TSS */ |
397 | .quad 0,0 /* LDT */ | 397 | .quad 0,0 /* LDT */ |
398 | .quad 0,0,0 /* three TLS descriptors */ | 398 | .quad 0,0,0 /* three TLS descriptors */ |
399 | .quad 0x00009a000000ffff /* __KERNEL16_CS - 16bit PM for S3 wakeup. */ | 399 | .quad 0 /* unused */ |
400 | /* base must be patched for real base address. */ | ||
401 | gdt_end: | 400 | gdt_end: |
402 | /* asm/segment.h:GDT_ENTRIES must match this */ | 401 | /* asm/segment.h:GDT_ENTRIES must match this */ |
403 | /* This should be a multiple of the cache line size */ | 402 | /* This should be a multiple of the cache line size */ |