diff options
author | Jonathan Corbet | 2016-12-27 20:53:44 +0100 |
---|---|---|
committer | Jonathan Corbet | 2016-12-27 20:53:44 +0100 |
commit | 54ab6db0909061ab7ee07233d3cab86d29f86e6c (patch) | |
tree | a7650ab5c0fa3a6a3841de8e8693041b3e009054 /include/uapi/linux/vhost.h | |
parent | docs: sphinx-extensions: make rstFlatTable work with docutils 0.13 (diff) | |
parent | Linux 4.10-rc1 (diff) | |
download | kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.tar.gz kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.tar.xz kernel-qcow2-linux-54ab6db0909061ab7ee07233d3cab86d29f86e6c.zip |
Merge tag 'v4.10-rc1' into docs-next
Linux 4.10-rc1
Diffstat (limited to 'include/uapi/linux/vhost.h')
-rw-r--r-- | include/uapi/linux/vhost.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/vhost.h b/include/uapi/linux/vhost.h index 56b7ab584cc0..60180c0b5dc6 100644 --- a/include/uapi/linux/vhost.h +++ b/include/uapi/linux/vhost.h @@ -172,8 +172,6 @@ struct vhost_memory { #define VHOST_F_LOG_ALL 26 /* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */ #define VHOST_NET_F_VIRTIO_NET_HDR 27 -/* Vhost have device IOTLB */ -#define VHOST_F_DEVICE_IOTLB 63 /* VHOST_SCSI specific definitions */ |