Patch "KVM: ARM/arm64: fix non-const declaration of function returning const" has been added to the 3.14-stable tree

This is a note to let you know that I've just added the patch titled

KVM: ARM/arm64: fix non-const declaration of function returning const

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
kvm-arm-arm64-fix-non-const-declaration-of-function-returning-const.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Will Deacon <[email protected]>
Date: Tue, 26 Aug 2014 15:13:20 +0100
Subject: KVM: ARM/arm64: fix non-const declaration of function returning const

From: Will Deacon <[email protected]>

commit 6951e48bff0b55d2a8e825a953fc1f8e3a34bf1c upstream.

Sparse kicks up about a type mismatch for kvm_target_cpu:

arch/arm64/kvm/guest.c:271:25: error: symbol 'kvm_target_cpu' redeclared with different type (originally declared at ./arch/arm64/include/asm/kvm_host.h:45) - different modifiers

so fix this by adding the missing const attribute to the function declaration.

---
 arch/arm/include/asm/kvm_host.h   |    2 +-
 arch/arm64/include/asm/kvm_host.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

@@ -42,7 +42,7 @@
 
 struct kvm_vcpu;
 u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);
-int kvm_target_cpu(void);
+int __attribute_const__ kvm_target_cpu(void);
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
 void kvm_reset_coprocs(struct kvm_vcpu *vcpu);
 

@@ -42,7 +42,7 @@
 #define KVM_VCPU_MAX_FEATURES 2
 
 struct kvm_vcpu;
-int kvm_target_cpu(void);
+int __attribute_const__ kvm_target_cpu(void);
 int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
 int kvm_arch_dev_ioctl_check_extension(long ext);
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/arm-kvm-user_mem_abort-support-stage-2-mmio-page-mapping.patch queue-3.14/kvm-arm-arm64-avoid-returning-negative-error-code-as-bool.patch queue-3.14/kvm-arm-arm64-fix-non-const-declaration-of-function-returning-const.patch queue-3.14/kvm-vgic-return-int-instead-of-bool-when-checking-i-o-ranges.patch queue-3.14/kvm-arm-arm64-fix-broken-__percpu-annotation.patch