diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 20:40:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 20:40:48 +0100 |
| commit | 455ba0c0b7e1d2c72a45808115ef35512e3ae7b0 (patch) | |
| tree | da5f3632a45273f970262591a9591857e5611afe /include | |
| parent | Merge branch 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| parent | Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from ol... (diff) | |
| download | linux-455ba0c0b7e1d2c72a45808115ef35512e3ae7b0.tar.xz linux-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.h | 3 |
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" |