git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
[pandora-kernel.git]
/
drivers
/
xen
/
xenbus
/
xenbus_xs.c
diff --git
a/drivers/xen/xenbus/xenbus_xs.c
b/drivers/xen/xenbus/xenbus_xs.c
index
b3b8f2f
..
ede860f
100644
(file)
--- a/
drivers/xen/xenbus/xenbus_xs.c
+++ b/
drivers/xen/xenbus/xenbus_xs.c
@@
-621,15
+621,6
@@
static struct xenbus_watch *find_watch(const char *token)
return NULL;
}
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)
{
/* Register callback to watch this node. */
int register_xenbus_watch(struct xenbus_watch *watch)
{
@@
-906,9
+897,5
@@
int xs_init(void)
if (IS_ERR(task))
return PTR_ERR(task);
if (IS_ERR(task))
return PTR_ERR(task);
- /* shutdown watches for kexec boot */
- if (xen_hvm_domain())
- xs_reset_watches();
-
return 0;
}
return 0;
}