---

yaml --- r: 97972 b: refs/heads/master c: 71cde58 h: refs/heads/master v: v3
git-mirror · Jun 6, 2008 · 3e3537f · 3e3537f
1 parent 4f56cbd
commit 3e3537f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74b6b522ec83f9c44fc7743f2adcb24664aa8f45
+refs/heads/master: 71cde5879f10b639506bc0b9f29a89f58b42a17e
diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c
@@ -423,13 +423,18 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
 	return -EINVAL; /* not implemented yet */
 }
 
+extern void s390_handle_mcck(void);
+
 static void __vcpu_run(struct kvm_vcpu *vcpu)
 {
 	memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16);
 
 	if (need_resched())
 		schedule();
 
+	if (test_thread_flag(TIF_MCCK_PENDING))
+		s390_handle_mcck();
+
 	vcpu->arch.sie_block->icptcode = 0;
 	local_irq_disable();
 	kvm_guest_enter();

diff --git a/trunk/drivers/s390/s390mach.c b/trunk/drivers/s390/s390mach.c
@@ -207,6 +207,7 @@ s390_handle_mcck(void)
 		do_exit(SIGSEGV);
 	}
 }
+EXPORT_SYMBOL_GPL(s390_handle_mcck);
 
 /*
  * returns 0 if all registers could be validated
-Original file line number
+Diff line change
@@ Expand Up / @@ -207,6 +207,7 @@ s390_handle_mcck(void) @@
     		do_exit(SIGSEGV);
     	}
     }
+    EXPORT_SYMBOL_GPL(s390_handle_mcck);
     /*
      * returns 0 if all registers could be validated
@@ Expand Down @@