| Message ID | 20201223120854.255347-1-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: Fix hyp_cpu_pm_{init,exit} __init annotation | expand |
On Wed, Dec 23, 2020 at 12:08:54PM +0000, Marc Zyngier wrote: > The __init annotations on hyp_cpu_pm_{init,exit} are obviously incorrect, > and the build system shouts at you if you enable DEBUG_SECTION_MISMATCH. > > Nothing really bad happens as we never execute that code outside of the > init context, but we can't label the callers as __int either, as kvm_init > isn't __init itself. Oh well. > > Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> > --- > arch/arm64/kvm/arm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 6e637d2b4cfb..71a49eae9ea0 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -1574,12 +1574,12 @@ static struct notifier_block hyp_init_cpu_pm_nb = { > .notifier_call = hyp_init_cpu_pm_notifier, > }; > > -static void __init hyp_cpu_pm_init(void) > +static void hyp_cpu_pm_init(void) > { > if (!is_protected_kvm_enabled()) > cpu_pm_register_notifier(&hyp_init_cpu_pm_nb); > } > -static void __init hyp_cpu_pm_exit(void) > +static void hyp_cpu_pm_exit(void) > { > if (!is_protected_kvm_enabled()) > cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb); > -- > 2.29.2 > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 6e637d2b4cfb..71a49eae9ea0 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1574,12 +1574,12 @@ static struct notifier_block hyp_init_cpu_pm_nb = { .notifier_call = hyp_init_cpu_pm_notifier, }; -static void __init hyp_cpu_pm_init(void) +static void hyp_cpu_pm_init(void) { if (!is_protected_kvm_enabled()) cpu_pm_register_notifier(&hyp_init_cpu_pm_nb); } -static void __init hyp_cpu_pm_exit(void) +static void hyp_cpu_pm_exit(void) { if (!is_protected_kvm_enabled()) cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
The __init annotations on hyp_cpu_pm_{init,exit} are obviously incorrect, and the build system shouts at you if you enable DEBUG_SECTION_MISMATCH. Nothing really bad happens as we never execute that code outside of the init context, but we can't label the callers as __int either, as kvm_init isn't __init itself. Oh well. Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/kvm/arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)