On Sat, 18 Jan, at 12:48:18PM, Borislav Petkov wrote: > From: Borislav Petkov <bp@xxxxxxx> > > ... into a kexec flavor for better code readability and simplicity. The > original one was getting ugly with ifdeffery. > > Signed-off-by: Borislav Petkov <bp@xxxxxxx> > Tested-by: Toshi Kani <toshi.kani@xxxxxx> > --- > arch/x86/platform/efi/efi.c | 148 +++++++++++++++++++++++++++++--------------- > include/linux/efi.h | 1 + > 2 files changed, 99 insertions(+), 50 deletions(-) [...] > @@ -1001,6 +986,72 @@ static void * __init efi_map_regions(int *count, int *pg_shift) > return new_memmap; > } > > +void __init kexec_enter_virtual_mode(void) > +{ Could this be static for now? > diff --git a/include/linux/efi.h b/include/linux/efi.h > index 0a819e7a60c9..44ea66ce41e0 100644 > --- a/include/linux/efi.h > +++ b/include/linux/efi.h > @@ -594,6 +594,7 @@ extern void efi_map_pal_code (void); > extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg); > extern void efi_gettimeofday (struct timespec *ts); > extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */ > +extern void kexec_enter_virtual_mode(void); > #ifdef CONFIG_X86 > extern void efi_late_init(void); > extern void efi_free_boot_services(void); Which would allow us to drop this change. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html