git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
trampoline.S
diff --git
a/arch/x86_64/kernel/trampoline.S
b/arch/x86_64/kernel/trampoline.S
index
23a03eb
..
c79b99a
100644
(file)
--- a/
arch/x86_64/kernel/trampoline.S
+++ b/
arch/x86_64/kernel/trampoline.S
@@
-64,7
+64,7
@@
idt_48:
.word 0, 0 # idt base = 0L
gdt_48:
.word 0, 0 # idt base = 0L
gdt_48:
- .short
__KERNEL32_CS + 7
# gdt limit
+ .short
GDT_ENTRIES*8 - 1
# gdt limit
.long cpu_gdt_table-__START_KERNEL_map
.globl trampoline_end
.long cpu_gdt_table-__START_KERNEL_map
.globl trampoline_end