Merge tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2014 03:43:14 +0000 (20:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2014 03:43:14 +0000 (20:43 -0700)
Pull char/misc fix from Greg KH:
 "Here's a single hyper-v driver fix for a reported issue"

* tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Drivers: hv: hv_fcopy: fix a race condition for SMP guest

drivers/hv/hv_fcopy.c

index eaaa3d843b8052c4c0d5b513567da720c6cfbe7a..23b2ce294c4ca78ea3f961ee102550e4aeb02632 100644 (file)
@@ -246,8 +246,8 @@ void hv_fcopy_onchannelcallback(void *context)
                /*
                 * Send the information to the user-level daemon.
                 */
-               fcopy_send_data();
                schedule_delayed_work(&fcopy_work, 5*HZ);
+               fcopy_send_data();
                return;
        }
        icmsghdr->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE;