Merge branch 'mixed-mode' into efi-for-mingo

mariux64 · Mar 5, 2014 · 617b3c3 · 617b3c3
2 parents 994448f + 3db4caf
commit 617b3c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
@@ -229,12 +229,14 @@ relocated:
 	xorl	%ebx, %ebx
 	jmp	*%eax
 
+#ifdef CONFIG_EFI_STUB
 	.data
 efi32_config:
 	.fill 11,8,0
 	.long efi_call_phys
 	.long 0
 	.byte 0
+#endif
 
 /*
  * Stack and heap for uncompression

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
@@ -440,6 +440,7 @@ gdt:
 	.quad   0x0000000000000000	/* TS continued */
 gdt_end:
 
+#ifdef CONFIG_EFI_STUB
 efi_config:
 	.quad	0
 
@@ -456,6 +457,8 @@ efi64_config:
 	.fill	11,8,0
 	.quad	efi_call6
 	.byte	1
+#endif /* CONFIG_EFI_STUB */
+
 /*
  * Stack and heap for uncompression
  */

diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
@@ -256,10 +256,11 @@ static void efi_stub_entry_update(void)
 
 #else
 
-static inline void update_pecoff_setup_and_reloc(unsigned int) {}
-static inline void update_pecoff_text(unsigned int, unsigned int) {}
+static inline void update_pecoff_setup_and_reloc(unsigned int size) {}
+static inline void update_pecoff_text(unsigned int text_start,
+				      unsigned int file_sz) {}
 static inline void efi_stub_defaults(void) {}
-static inline void efi_stup_entry_update(void) {}
+static inline void efi_stub_entry_update(void) {}
 
 static inline int reserve_pecoff_reloc_section(int c)
 {