On Thu, 28 Nov 2013 16:41:23 +0000, Leif Lindholm <leif.lindholm@xxxxxxxxxx> wrote: > Since the efi_set_virtual_address_map call has strict init ordering > requirements, add an explicit hook in the required place. > > Signed-off-by: Leif Lindholm <leif.lindholm@xxxxxxxxxx> > --- > init/main.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/init/main.c b/init/main.c > index febc511..1331829 100644 > --- a/init/main.c > +++ b/init/main.c > @@ -905,6 +905,10 @@ static noinline void __init kernel_init_freeable(void) > smp_prepare_cpus(setup_max_cpus); > > do_pre_smp_initcalls(); > + > + if (IS_ENABLED(CONFIG_ARM) && efi_enabled(EFI_BOOT)) > + efi_enter_virtual_mode(); > + Personally, I would put the IS_ENABLED() and efi_enabled() tests into efi_enter_virtual_mode() itself (or an empty stub for the !IS_ENABLED() case), but that is mostly a nit. Acked-by: Grant Likely <grant.likely@xxxxxxxxxx> > lockup_detector_init(); > > smp_init(); > -- > 1.7.10.4 > -- 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
