openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
H. Peter Anvin 2012-11-20 16:49:15 -08:00
parent ddd32b4289 0f905a43ce
commit c1ddb48204
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/boot/compressed/eboot.c
View File

@ -12,6 +12,8 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/desc.h> #include <asm/desc.h>
#undef memcpy /* Use memcpy from misc.c */
#include "eboot.h" #include "eboot.h"
static efi_system_table_t *sys_table; static efi_system_table_t *sys_table;

3
arch/x86/boot/header.S
View File

@ -476,6 +476,3 @@ die:
setup_corrupt: setup_corrupt:
.byte 7 .byte 7
.string "No setup signature found...\n" .string "No setup signature found...\n"
.data
dummy: .long 0