diff options
| author | Ingo Molnar | 2015-10-14 16:05:18 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-10-14 16:05:18 +0200 |
| commit | c7d77a7980e434c3af17de19e3348157f9b9ccce (patch) | |
| tree | b32c5988ce8239b80c83e94c22d68f5eb0fb84da /arch/x86/boot/header.S | |
| parent | efi: Use the generic efi.memmap instead of 'memmap' (diff) | |
| parent | x86/efi: Fix multiple GOP device support (diff) | |
| download | kernel-qcow2-linux-c7d77a7980e434c3af17de19e3348157f9b9ccce.tar.gz kernel-qcow2-linux-c7d77a7980e434c3af17de19e3348157f9b9ccce.tar.xz kernel-qcow2-linux-c7d77a7980e434c3af17de19e3348157f9b9ccce.zip | |
Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/header.S')
| -rw-r--r-- | arch/x86/boot/header.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 7a6d43a554d7..6236b9ec4b76 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -414,7 +414,7 @@ xloadflags: # define XLF23 0 #endif -#if defined(CONFIG_X86_64) && defined(CONFIG_EFI) && defined(CONFIG_KEXEC) +#if defined(CONFIG_X86_64) && defined(CONFIG_EFI) && defined(CONFIG_KEXEC_CORE) # define XLF4 XLF_EFI_KEXEC #else # define XLF4 0 |