Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[deliverable/linux.git] / arch / x86 / boot / compressed / head_32.S

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index c85e3ac99bbabc597d772cb85b4efd4d4b3bc291..aa4aaf1b23803e8ef0e180e3cbeedc7a4db6c556 100644 (file)
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -42,6 +42,16 @@ ENTRY(startup_32)
         */
        add     $0x4, %esp
 
+       call    make_boot_params
+       cmpl    $0, %eax
+       je      1f
+       movl    0x4(%esp), %esi
+       movl    (%esp), %ecx
+       pushl   %eax
+       pushl   %esi
+       pushl   %ecx
+
+       .org 0x30,0x90
        call    efi_main
        cmpl    $0, %eax
        movl    %eax, %esi