Commit fa24615f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

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
parents 5556ea4d 2ef82d24
...@@ -246,8 +246,8 @@ void hv_fcopy_onchannelcallback(void *context) ...@@ -246,8 +246,8 @@ void hv_fcopy_onchannelcallback(void *context)
/* /*
* Send the information to the user-level daemon. * Send the information to the user-level daemon.
*/ */
fcopy_send_data();
schedule_delayed_work(&fcopy_work, 5*HZ); schedule_delayed_work(&fcopy_work, 5*HZ);
fcopy_send_data();
return; return;
} }
icmsghdr->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE; icmsghdr->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment