Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / boot / header.S

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 9b9c6475b3614ccf976cbb5bb462ea9c6b3a52f0..b4e15dd6786a166b1fc16b0d24a1bb4f78a7295e 100644 (file)
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -283,7 +283,7 @@ _start:
        # Part 2 of the header, from the old setup.S
 
                .ascii  "HdrS"          # header signature
-               .word   0x020a          # header version number (>= 0x0105)
+               .word   0x020b          # header version number (>= 0x0105)
                                        # or else old loadlin-1.5 will fail)
                .globl realmode_swtch
 realmode_swtch:        .word   0, 0            # default_switch, SETUPSEG
@@ -401,6 +401,8 @@ pref_address:               .quad LOAD_PHYSICAL_ADDR        # preferred load addr
 #define INIT_SIZE VO_INIT_SIZE
 #endif
 init_size:             .long INIT_SIZE         # kernel initialization size
+handover_offset:       .long 0x30              # offset to the handover
+                                               # protocol entry point
 
 # End of setup header #####################################################