| Message ID | 1372183863-11333-5-git-send-email-leif.lindholm@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Jun 25, 2013 at 7:11 PM, Leif Lindholm <leif.lindholm@linaro.org> 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@linaro.org> > --- > init/main.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/init/main.c b/init/main.c > index 9484f4b..c61706e 100644 > --- a/init/main.c > +++ b/init/main.c > @@ -872,6 +872,12 @@ static noinline void __init kernel_init_freeable(void) > smp_prepare_cpus(setup_max_cpus); > > do_pre_smp_initcalls(); > + > +#ifdef CONFIG_ARM > + if (efi_enabled(EFI_RUNTIME_SERVICES)) > + efi_enter_virtual_mode(); > +#endif Nitpick: Alternately you could use: if (IS_ENABLED(CONFIG_ARM) && efi_enabled(EFI_RUNTIME_SERVICES)) efi_enter_virtual_mode(); That would get away from the #ifdef g.
diff --git a/init/main.c b/init/main.c index 9484f4b..c61706e 100644 --- a/init/main.c +++ b/init/main.c @@ -872,6 +872,12 @@ static noinline void __init kernel_init_freeable(void) smp_prepare_cpus(setup_max_cpus); do_pre_smp_initcalls(); + +#ifdef CONFIG_ARM + if (efi_enabled(EFI_RUNTIME_SERVICES)) + efi_enter_virtual_mode(); +#endif + lockup_detector_init(); smp_init();
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@linaro.org> --- init/main.c | 6 ++++++ 1 file changed, 6 insertions(+)