diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-30 22:15:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-30 22:15:31 +0100 |
| commit | b388dc1f62a9bdd9c4758a0664e61d0f9a9da519 (patch) | |
| tree | 696fd3c245700ee59ebcf3a65b90f8773b904624 /drivers/xen/xenbus/xenbus_xs.c | |
| parent | 6969b2bae6dbe7f277a7c018b66d2f3ad662129f (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
| download | linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.gz linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.bz2 linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.zip | |
Merge tag 'v4.13-rc7' into asoc-component
Linux 4.13-rc7
Diffstat (limited to 'drivers/xen/xenbus/xenbus_xs.c')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_xs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index e46080214955..3e59590c7254 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -857,6 +857,8 @@ static int xenwatch_thread(void *unused) struct list_head *ent; struct xs_watch_event *event; + xenwatch_pid = current->pid; + for (;;) { wait_event_interruptible(watch_events_waitq, !list_empty(&watch_events)); @@ -925,7 +927,6 @@ int xs_init(void) task = kthread_run(xenwatch_thread, NULL, "xenwatch"); if (IS_ERR(task)) return PTR_ERR(task); - xenwatch_pid = task->pid; /* shutdown watches for kexec boot */ xs_reset_watches(); |