diff --git a/[refs] b/[refs]
index 8c4d6d59d3da..7683eca6cf10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d379dad8f1670d233ac67b76b1c5a42ad3714a3
+refs/heads/master: 29a6c25bd63dbd52e73d25268402d065ad84c0fe
diff --git a/trunk/arch/x86_64/kernel/trampoline.S b/trunk/arch/x86_64/kernel/trampoline.S
index 23a03eb91fc7..c79b99a9e2f6 100644
--- a/trunk/arch/x86_64/kernel/trampoline.S
+++ b/trunk/arch/x86_64/kernel/trampoline.S
@@ -64,7 +64,7 @@ idt_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