This is not to break the build for other architectures than x86 and ppc. Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@xxxxxxxxxxxxx> Signed-off-by: Fernando Luis Vazquez Cao <fernando@xxxxxxxxxxxxx> --- arch/ia64/include/asm/kvm_host.h | 5 +++++ arch/powerpc/include/asm/kvm_host.h | 6 ++++++ arch/s390/include/asm/kvm_host.h | 6 ++++++ arch/x86/include/asm/kvm_host.h | 5 +++++ 4 files changed, 22 insertions(+), 0 deletions(-) diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h index a362e67..938041b 100644 --- a/arch/ia64/include/asm/kvm_host.h +++ b/arch/ia64/include/asm/kvm_host.h @@ -589,6 +589,11 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu); int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); void kvm_sal_emul(struct kvm_vcpu *vcpu); +static inline int kvm_set_bit_user(int nr, void __user *addr) +{ + return 0; +} + #endif /* __ASSEMBLY__*/ #endif diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index 0c9ad86..9463524 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h @@ -26,6 +26,7 @@ #include <linux/types.h> #include <linux/kvm_types.h> #include <asm/kvm_asm.h> +#include <asm/uaccess.h> #define KVM_MAX_VCPUS 1 #define KVM_MEMORY_SLOTS 32 @@ -287,4 +288,9 @@ struct kvm_vcpu_arch { #endif }; +static inline int kvm_set_bit_user(int nr, void __user *addr) +{ + return set_bit_user_non_atomic(nr, addr); +} + #endif /* __POWERPC_KVM_HOST_H__ */ diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 27605b6..36710ee 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -238,4 +238,10 @@ struct kvm_arch{ }; extern int sie64a(struct kvm_s390_sie_block *, unsigned long *); + +static inline int kvm_set_bit_user(int nr, void __user *addr) +{ + return 0; +} + #endif diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3f0007b..9e22df9 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -795,4 +795,9 @@ void kvm_set_shared_msr(unsigned index, u64 val, u64 mask); bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip); +static inline int kvm_set_bit_user(int nr, void __user *addr) +{ + return set_bit_user_non_atomic(nr, addr); +} + #endif /* _ASM_X86_KVM_HOST_H */ -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html