projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ovl/rename2' into for-linus
[cascardo/linux.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
04db6fb
..
8dd3784
100644
(file)
--- a/
arch/x86/platform/efi/efi_64.c
+++ b/
arch/x86/platform/efi/efi_64.c
@@
-25,6
+25,7
@@
#include <linux/bootmem.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/bootmem.h>
#include <linux/ioport.h>
#include <linux/init.h>
+#include <linux/mc146818rtc.h>
#include <linux/efi.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/efi.h>
#include <linux/uaccess.h>
#include <linux/io.h>
@@
-244,7
+245,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.
*/
* 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;
/*
return 0;
/*