| Message ID | 20191104230001.27774-6-aarcange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM monolithic v3 | expand |
On 04/11/19 23:59, Andrea Arcangeli wrote: > Add more section prefixes because with the monolithic KVM model the > section checker can now do a more accurate static analysis at build > time and this allows to build without > CONFIG_SECTION_MISMATCH_WARN_ONLY=n. > > Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> > --- > arch/powerpc/kvm/book3s.c | 2 +- > arch/x86/kvm/x86.c | 4 ++-- > include/linux/kvm_host.h | 8 ++++---- > virt/kvm/arm/arm.c | 2 +- > virt/kvm/kvm_main.c | 6 +++--- > 5 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c > index ec2547cc5ecb..e80e9504722a 100644 > --- a/arch/powerpc/kvm/book3s.c > +++ b/arch/powerpc/kvm/book3s.c > @@ -1067,7 +1067,7 @@ int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin) > > #endif /* CONFIG_KVM_XICS */ > > -static int kvmppc_book3s_init(void) > +static __init int kvmppc_book3s_init(void) > { > int r; > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index fb963e6b2e54..5e98fa6b7bf8 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -9272,7 +9272,7 @@ void kvm_arch_hardware_disable(void) > drop_user_return_notifiers(); > } > > -int kvm_arch_hardware_setup(void) > +__init int kvm_arch_hardware_setup(void) > { > int r; > > @@ -9303,7 +9303,7 @@ void kvm_arch_hardware_unsetup(void) > kvm_x86_hardware_unsetup(); > } > > -int kvm_arch_check_processor_compat(void) > +__init int kvm_arch_check_processor_compat(void) > { > return kvm_x86_check_processor_compatibility(); > } > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 719fc3e15ea4..426bc2f485a9 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -616,8 +616,8 @@ static inline void kvm_irqfd_exit(void) > { > } > #endif > -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > - struct module *module); > +__init int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > + struct module *module); > void kvm_exit(void); > > void kvm_get_kvm(struct kvm *kvm); > @@ -867,9 +867,9 @@ void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu); > > int kvm_arch_hardware_enable(void); > void kvm_arch_hardware_disable(void); > -int kvm_arch_hardware_setup(void); > +__init int kvm_arch_hardware_setup(void); > void kvm_arch_hardware_unsetup(void); > -int kvm_arch_check_processor_compat(void); > +__init int kvm_arch_check_processor_compat(void); > int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu); > bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu); > int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu); > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > index 86c6aa1cb58e..65f7f0f6868d 100644 > --- a/virt/kvm/arm/arm.c > +++ b/virt/kvm/arm/arm.c > @@ -1726,7 +1726,7 @@ void kvm_arch_exit(void) > kvm_perf_teardown(); > } > > -static int arm_init(void) > +static __init int arm_init(void) > { > int rc = kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE); > return rc; > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index d6f0696d98ef..1b7fbd138406 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -4246,13 +4246,13 @@ static void kvm_sched_out(struct preempt_notifier *pn, > kvm_arch_vcpu_put(vcpu); > } > > -static void check_processor_compat(void *rtn) > +static __init void check_processor_compat(void *rtn) > { > *(int *)rtn = kvm_arch_check_processor_compat(); > } > > -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > - struct module *module) > +__init int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, > + struct module *module) > { > int r; > int cpu; > Queued, thanks. Paolo
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index ec2547cc5ecb..e80e9504722a 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -1067,7 +1067,7 @@ int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin) #endif /* CONFIG_KVM_XICS */ -static int kvmppc_book3s_init(void) +static __init int kvmppc_book3s_init(void) { int r; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fb963e6b2e54..5e98fa6b7bf8 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9272,7 +9272,7 @@ void kvm_arch_hardware_disable(void) drop_user_return_notifiers(); } -int kvm_arch_hardware_setup(void) +__init int kvm_arch_hardware_setup(void) { int r; @@ -9303,7 +9303,7 @@ void kvm_arch_hardware_unsetup(void) kvm_x86_hardware_unsetup(); } -int kvm_arch_check_processor_compat(void) +__init int kvm_arch_check_processor_compat(void) { return kvm_x86_check_processor_compatibility(); } diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 719fc3e15ea4..426bc2f485a9 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -616,8 +616,8 @@ static inline void kvm_irqfd_exit(void) { } #endif -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, - struct module *module); +__init int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, + struct module *module); void kvm_exit(void); void kvm_get_kvm(struct kvm *kvm); @@ -867,9 +867,9 @@ void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu); int kvm_arch_hardware_enable(void); void kvm_arch_hardware_disable(void); -int kvm_arch_hardware_setup(void); +__init int kvm_arch_hardware_setup(void); void kvm_arch_hardware_unsetup(void); -int kvm_arch_check_processor_compat(void); +__init int kvm_arch_check_processor_compat(void); int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu); bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu); int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu); diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 86c6aa1cb58e..65f7f0f6868d 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -1726,7 +1726,7 @@ void kvm_arch_exit(void) kvm_perf_teardown(); } -static int arm_init(void) +static __init int arm_init(void) { int rc = kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE); return rc; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d6f0696d98ef..1b7fbd138406 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4246,13 +4246,13 @@ static void kvm_sched_out(struct preempt_notifier *pn, kvm_arch_vcpu_put(vcpu); } -static void check_processor_compat(void *rtn) +static __init void check_processor_compat(void *rtn) { *(int *)rtn = kvm_arch_check_processor_compat(); } -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, - struct module *module) +__init int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, + struct module *module) { int r; int cpu;
Add more section prefixes because with the monolithic KVM model the section checker can now do a more accurate static analysis at build time and this allows to build without CONFIG_SECTION_MISMATCH_WARN_ONLY=n. Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> --- arch/powerpc/kvm/book3s.c | 2 +- arch/x86/kvm/x86.c | 4 ++-- include/linux/kvm_host.h | 8 ++++---- virt/kvm/arm/arm.c | 2 +- virt/kvm/kvm_main.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-)