vserver 2.0 rc7

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

diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S
index fc52ed8..75d4d2a 100644 (file)
--- a/arch/x86_64/boot/setup.S
+++ b/arch/x86_64/boot/setup.S
@@ -158,7 +158,9 @@ cmd_line_ptr:       .long 0                 # (Header version 0x0202 or later)
 ramdisk_max:   .long 0xffffffff
        
 trampoline:    call    start_of_setup
-               .space  1024
+               .align 16
+                                       # The offset at this point is 0x240
+               .space  (0xeff-0x240+1) # E820 & EDD space (ending at 0xeff)
 # End of setup header #####################################################
 
 start_of_setup:
@@ -410,9 +412,9 @@ jmpe820:
        # sizeof(e820rec).
        #
 good820:
-       movb    (E820NR), %al                   # up to 32 entries
+       movb    (E820NR), %al                   # up to 128 entries
        cmpb    $E820MAX, %al
-       jnl     bail820
+       jae     bail820
 
        incb    (E820NR)
        movw    %di, %ax