Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

2 files changed, 4 insertions, 3 deletions

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index d82551efbfbf..f06cf93b178e 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -79,8 +79,9 @@ int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)
         return r;
 }
 
-void kvm_arch_hardware_enable(void *garbage)
+int kvm_arch_hardware_enable(void *garbage)
 {
+        return 0;
 }
 
 void kvm_arch_hardware_disable(void *garbage)
@@ -435,7 +436,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
 
         switch (ioctl) {
         default:
-                r = -EINVAL;
+                r = -ENOTTY;
         }
 
         return r;
diff --git a/arch/powerpc/kvm/timing.h b/arch/powerpc/kvm/timing.h
index 806ef67868bd..8167d42a776f 100644
--- a/arch/powerpc/kvm/timing.h
+++ b/arch/powerpc/kvm/timing.h
@@ -51,7 +51,7 @@ static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
 
         /* The BUILD_BUG_ON below breaks in funny ways, commented out
          * for now ... -BenH
-        BUILD_BUG_ON(__builtin_constant_p(type));
+        BUILD_BUG_ON(!__builtin_constant_p(type));
         */
         switch (type) {
         case EXT_INTR_EXITS: