Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / header.S

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 64ad9016585afd26fec078bc7b3a14ff69d699fd..af86e431acfae2af91957a9932c3bf5fb96bd5fb 100644 (file)
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -22,6 +22,7 @@
 #include <asm/page.h>
 #include <asm/setup.h>
 #include "boot.h"
+#include "offsets.h"
 
 SETUPSECTS     = 4                     /* default nr of setup-sectors */
 BOOTSEG                = 0x07C0                /* original address of boot-sector */
@@ -119,7 +120,7 @@ _start:
        # Part 2 of the header, from the old setup.S
 
                .ascii  "HdrS"          # header signature
-               .word   0x0207          # header version number (>= 0x0105)
+               .word   0x0209          # header version number (>= 0x0105)
                                        # or else old loadlin-1.5 will fail)
                .globl realmode_swtch
 realmode_swtch:        .word   0, 0            # default_switch, SETUPSEG
@@ -223,6 +224,13 @@ hardware_subarch:  .long 0                 # subarchitecture, added with 2.07
 
 hardware_subarch_data: .quad 0
 
+payload_offset:                .long input_data
+payload_length:                .long input_data_end-input_data
+
+setup_data:            .quad 0                 # 64-bit physical pointer to
+                                               # single linked list of
+                                               # struct setup_data
+
 # End of setup header #####################################################
 
        .section ".inittext", "ax"