diff --git a/[refs] b/[refs]
index c1bc3dc3ed9e..5178ff0c8c1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14679eb3c50897889ba62f9a37e3bcd8a205b5e7
+refs/heads/master: 51d67a488b53a5cc8401460480c124eaec71e2d4
diff --git a/trunk/arch/x86_64/boot/setup.S b/trunk/arch/x86_64/boot/setup.S
index c3bfd223ab49..770940cc0108 100644
--- a/trunk/arch/x86_64/boot/setup.S
+++ b/trunk/arch/x86_64/boot/setup.S
@@ -836,13 +836,12 @@ gdt:
 	.word	0x9200				# data read/write
 	.word	0x00CF				# granularity = 4096, 386
 						#  (+5th nibble of limit)
+gdt_end:
 idt_48:
 	.word	0				# idt limit = 0
 	.word	0, 0				# idt base = 0L
 gdt_48:
-	.word	0x8000				# gdt limit=2048,
-						#  256 GDT entries
-
+	.word	gdt_end-gdt-1			# gdt limit
 	.word	0, 0				# gdt base (filled in later)
 
 # Include video setup & detection code