projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'efi/urgent' into efi/core, to pick up fixes
[linux-block.git]
/
arch
/
x86
/
platform
/
efi
/
efi_64.c
diff --git
a/arch/x86/platform/efi/efi_64.c
b/arch/x86/platform/efi/efi_64.c
index d65cdadaa6b61401816fc9af66db0f61524e2445..58b0f801f66f97212fb9904c77d88ad44c2703de 100644
(file)
--- a/
arch/x86/platform/efi/efi_64.c
+++ b/
arch/x86/platform/efi/efi_64.c
@@
-244,7
+244,7
@@
int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
* text and allocate a new stack because we can't rely on the
* stack pointer being < 4GB.
*/
- if (!IS_ENABLED(CONFIG_EFI_MIXED))
+ if (!IS_ENABLED(CONFIG_EFI_MIXED)
|| efi_is_native()
)
return 0;
page = alloc_page(GFP_KERNEL|__GFP_DMA32);