2 files changed, 15 insertions, 1 deletions

diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index 46347a49c5b8..d1071de11878 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -620,6 +620,15 @@ static struct xenbus_watch *find_watch(const char *token)
         return NULL;
 }
 
+static void xs_reset_watches(void)
+{
+        int err;
+
+        err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));
+        if (err && err != -EEXIST)
+                printk(KERN_WARNING "xs_reset_watches failed: %d\n", err);
+}
+
 /* Register callback to watch this node. */
 int register_xenbus_watch(struct xenbus_watch *watch)
 {
@@ -896,5 +905,9 @@ int xs_init(void)
         if (IS_ERR(task))
                 return PTR_ERR(task);
 
+        /* shutdown watches for kexec boot */
+        if (xen_hvm_domain())
+                xs_reset_watches();
+
         return 0;
 }
diff --git a/include/xen/interface/io/xs_wire.h b/include/xen/interface/io/xs_wire.h
index f6f07aa35af5..f0b6890370be 100644
--- a/include/xen/interface/io/xs_wire.h
+++ b/include/xen/interface/io/xs_wire.h
@@ -29,7 +29,8 @@ enum xsd_sockmsg_type
     XS_IS_DOMAIN_INTRODUCED,
     XS_RESUME,
     XS_SET_TARGET,
-    XS_RESTRICT
+    XS_RESTRICT,
+    XS_RESET_WATCHES
 };
 
 #define XS_WRITE_NONE "NONE"