Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 455ba0c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-fixes-3.2' of... 

Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
parents 26957f0e 12275dd4

drivers/xen/xenbus/xenbus_xs.c

+0 −13
Original line number Diff line number Diff line
@@ -621,15 +621,6 @@ 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)

{
@@ -906,9 +897,5 @@ 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;

}

include/xen/interface/io/xs_wire.h

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ enum xsd_sockmsg_type 
    XS_IS_DOMAIN_INTRODUCED,

    XS_RESUME,

    XS_SET_TARGET,

    XS_RESTRICT,

    XS_RESET_WATCHES

    XS_RESTRICT

};



#define XS_WRITE_NONE "NONE"