diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:03:09 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:03:09 +0300 |
| commit | b0599e2801df79d571c9e9a763b174b9f0edc558 (patch) | |
| tree | def75d59c85598705ec92fbad889923ea40e308d /arch/x86/platform | |
| parent | f779ca740f25c8a6a72d951334f9efc3158a318b (diff) | |
| parent | 116fef6408599dd6ff6996235c50aa692e9b5631 (diff) | |
| download | linux-b0599e2801df79d571c9e9a763b174b9f0edc558.tar.xz | |
Merge branch 'x86/mm' into efi/core
This commit in x86/mm changed EFI code:
116fef640859: x86/mm/dump_pagetables: Add the EFI pagetable to the debugfs 'page_tables' directory
So merge in that commit plus its dependencies, before continuing with
EFI work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/efi/efi_64.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index c310a8284358..780460aa5ea5 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -27,6 +27,7 @@ #include <linux/ioport.h> #include <linux/mc146818rtc.h> #include <linux/efi.h> +#include <linux/export.h> #include <linux/uaccess.h> #include <linux/io.h> #include <linux/reboot.h> @@ -190,7 +191,8 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd) early_code_mapping_set_exec(0); } -static pgd_t *efi_pgd; +pgd_t *efi_pgd; +EXPORT_SYMBOL_GPL(efi_pgd); /* * We need our own copy of the higher levels of the page tables |