summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 11:40:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 11:40:48 -0800
commit455ba0c0b7e1d2c72a45808115ef35512e3ae7b0 (patch)
treeda5f3632a45273f970262591a9591857e5611afe /include
parent26957f0e4bb4767c8157a46795cf684426551637 (diff)
parent12275dd4b747f5d87fa36229774d76bca8e63068 (diff)
downloadlwn-455ba0c0b7e1d2c72a45808115ef35512e3ae7b0.tar.gz
lwn-455ba0c0b7e1d2c72a45808115ef35512e3ae7b0.zip
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"
Diffstat (limited to 'include')
-rw-r--r--include/xen/interface/io/xs_wire.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/xen/interface/io/xs_wire.h b/include/xen/interface/io/xs_wire.h
index f0b6890370be..f6f07aa35af5 100644
--- a/include/xen/interface/io/xs_wire.h
+++ b/include/xen/interface/io/xs_wire.h
@@ -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"