Merge commit 'efi-for-3.7-v2' into x86/urgent

2012-11-20 16:49:15 -08:00 · 2012-11-20 16:49:15 -08:00 · c1ddb48204
commit c1ddb48204
parent ddd32b4289 0f905a43ce
2 changed files with 2 additions and 3 deletions
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@ -12,6 +12,8 @@
 #include <asm/setup.h>
 #include <asm/desc.h>

+#undef memcpy			/* Use memcpy from misc.c */
+
 #include "eboot.h"

 static efi_system_table_t *sys_table;
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@ -476,6 +476,3 @@ die:
 setup_corrupt:
 	.byte	7
 	.string	"No setup signature found...\n"
-
-	.data
-dummy:	.long	0