KVM: ARM/arm64: fix broken __percpu annotation
authorWill Deacon <will.deacon@arm.com>
Tue, 26 Aug 2014 14:13:21 +0000 (15:13 +0100)
committerChristoffer Dall <christoffer.dall@linaro.org>
Wed, 27 Aug 2014 20:49:45 +0000 (22:49 +0200)
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>
arch/arm/kvm/arm.c
arch/arm64/include/asm/kvm_host.h

index ac306b4dbe1db4f87c283eee364ea200a04c67c9..53ee31b23961129d083ece832273592c96bb2afc 100644 (file)
@@ -82,7 +82,7 @@ struct kvm_vcpu *kvm_arm_get_running_vcpu(void)
 /**
  * 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;
 }
index 44094e5598480b21e545cae9f8daa93292e9434d..50431d36732b1db68630505273c22f84628ef67f 100644 (file)
@@ -193,7 +193,7 @@ static inline int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)
 }
 
 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, ...);