4 files changed, 11 insertions, 5 deletions

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index ce961495b5e1..622037d851a3 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -14,6 +14,7 @@
 #include <linux/err.h>
 #include <linux/kdebug.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/bootmem.h>
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 1cab8a177d0e..7a27eebab28a 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -119,8 +119,13 @@ static int handle_validity(struct kvm_vcpu *vcpu)
 
         vcpu->stat.exit_validity++;
         trace_kvm_s390_intercept_validity(vcpu, viwhy);
-        WARN_ONCE(true, "kvm: unhandled validity intercept 0x%x\n", viwhy);
-        return -EOPNOTSUPP;
+        KVM_EVENT(3, "validity intercept 0x%x for pid %u (kvm 0x%pK)", viwhy,
+                  current->pid, vcpu->kvm);
+
+        /* do not warn on invalid runtime instrumentation mode */
+        WARN_ONCE(viwhy != 0x44, "kvm: unhandled validity intercept 0x%x\n",
+                  viwhy);
+        return -EINVAL;
 }
 
 static int handle_instruction(struct kvm_vcpu *vcpu)
diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index c7220ba94aa7..1a22de70f7f7 100644
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -594,7 +594,7 @@ static void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
         ioapic->irr = 0;
         ioapic->irr_delivered = 0;
         ioapic->id = 0;
-        memset(ioapic->irq_eoi, 0x00, IOAPIC_NUM_PINS);
+        memset(ioapic->irq_eoi, 0x00, sizeof(ioapic->irq_eoi));
         rtc_irq_eoi_tracking_reset(ioapic);
 }
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6c633de84dd7..e375235d81c9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5733,13 +5733,13 @@ static int kvmclock_cpu_online(unsigned int cpu)
 
 static void kvm_timer_init(void)
 {
-        int cpu;
-
         max_tsc_khz = tsc_khz;
 
         if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
 #ifdef CONFIG_CPU_FREQ
                 struct cpufreq_policy policy;
+                int cpu;
+
                 memset(&policy, 0, sizeof(policy));
                 cpu = get_cpu();
                 cpufreq_get_policy(&policy, cpu);