| From 4000be423cb01a8d09de878bb8184511c49d4238 Mon Sep 17 00:00:00 2001 |
| From: Will Deacon <will.deacon@arm.com> |
| Date: Tue, 26 Aug 2014 15:13:21 +0100 |
| Subject: KVM: ARM/arm64: fix broken __percpu annotation |
| |
| From: Will Deacon <will.deacon@arm.com> |
| |
| commit 4000be423cb01a8d09de878bb8184511c49d4238 upstream. |
| |
| Running sparse results in a bunch of noisy address space mismatches |
| thanks to the broken __percpu annotation on kvm_get_running_vcpus. |
| |
| This function returns a pcpu pointer to a pointer, not a pointer to a |
| pcpu pointer. This patch fixes the annotation, which kills the warnings |
| from sparse. |
| |
| Cc: Christoffer Dall <christoffer.dall@linaro.org> |
| Cc: Marc Zyngier <marc.zyngier@arm.com> |
| Signed-off-by: Will Deacon <will.deacon@arm.com> |
| Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> |
| Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/kvm/arm.c | 2 +- |
| arch/arm64/include/asm/kvm_host.h | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/kvm/arm.c |
| +++ b/arch/arm/kvm/arm.c |
| @@ -82,7 +82,7 @@ struct kvm_vcpu *kvm_arm_get_running_vcp |
| /** |
| * kvm_arm_get_running_vcpus - get the per-CPU array of currently running vcpus. |
| */ |
| -struct kvm_vcpu __percpu **kvm_get_running_vcpus(void) |
| +struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void) |
| { |
| return &kvm_arm_running_vcpu; |
| } |
| --- a/arch/arm64/include/asm/kvm_host.h |
| +++ b/arch/arm64/include/asm/kvm_host.h |
| @@ -177,7 +177,7 @@ static inline int kvm_test_age_hva(struc |
| } |
| |
| struct kvm_vcpu *kvm_arm_get_running_vcpu(void); |
| -struct kvm_vcpu __percpu **kvm_get_running_vcpus(void); |
| +struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void); |
| |
| u64 kvm_call_hyp(void *hypfn, ...); |
| |
