Merge tag 'core-entry-notify-signal' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / kernel / entry / kvm.c

diff --git a/kernel/entry/kvm.c b/kernel/entry/kvm.c
index b6678a5e3cf64807f73852445183d27e554f5c58..49972ee99aff6a5f033a18cb9f90fd91c0c0e211 100644 (file)
--- a/kernel/entry/kvm.c
+++ b/kernel/entry/kvm.c
@@ -8,6 +8,9 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work)
        do {
                int ret;
 
+               if (ti_work & _TIF_NOTIFY_SIGNAL)
+                       tracehook_notify_signal();
+
                if (ti_work & _TIF_SIGPENDING) {
                        kvm_handle_signal_exit(vcpu);
                        return -EINTR;