diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-20 16:49:15 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-11-20 16:49:15 -0800 |
| commit | c1ddb482044ca6bfe3de6d45ef17383f3d719ed7 (patch) | |
| tree | ada9c458cd771755461f8d423cc917aefd64663b | |
| parent | ddd32b4289a6feda9ad9e68b0d85641c389a72ba (diff) | |
| parent | 0f905a43ce955b638139bd84486194770a6a2c08 (diff) | |
Merge commit 'efi-for-3.7-v2' into x86/urgent
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/header.S | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index c760e073963e..e87b0cac14b5 100644 --- 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; diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 2a017441b8b2..8c132a625b94 100644 --- 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 |