From f9d9d4c0a6bf6d693d882ea99f0e57b0241b3370 Mon Sep 17 00:00:00 2001 From: Simon Gaiser Date: Tue, 30 Jan 2018 07:34:40 +0100 Subject: [PATCH 1/4] Revert "xen: avoid deadlock in xenbus" This reverts commit 529871bb3c0675d0b425e2070d5a739db097be98. --- drivers/xen/xenbus/xenbus_xs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index 3e59590c7254..e46080214955 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -857,8 +857,6 @@ 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)); @@ -927,6 +925,7 @@ 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(); -- 2.15.1