Pull sbs into release branch

[linux-2.6-omap-h63xx.git] / arch / x86_64 / boot / setup.S

diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S
index c3bfd223ab49e2866bc54f154dac6bf9867e18a9..770940cc0108872e24f7208657d67825c06018fe 100644 (file)
--- a/arch/x86_64/boot/setup.S
+++ b/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