aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost/vsock.h
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-12-09 10:51:12 +0800
committerDavid S. Miller <davem@davemloft.net>2015-12-08 21:55:49 -0500
commit8ac2837c89c8c0fcad557e4380aeef80580390f9 (patch)
tree9fc34a91680351c4bb706a663516b7e79c44978d /drivers/vhost/vsock.h
parentMerge branch 'sh_eth-optimize-mdio' (diff)
downloadlinux-dev-8ac2837c89c8c0fcad557e4380aeef80580390f9.tar.xz
linux-dev-8ac2837c89c8c0fcad557e4380aeef80580390f9.zip
Revert "Merge branch 'vsock-virtio'"
This reverts commit 0d76d6e8b2507983a2cae4c09880798079007421 and merge commit c402293bd76fbc93e52ef8c0947ab81eea3ae019, reversing changes made to c89359a42e2a49656451569c382eed63e781153c. The virtio-vsock device specification is not finalized yet. Michael Tsirkin voiced concerned about merging this code when the hardware interface (and possibly the userspace interface) could still change. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost/vsock.h')
-rw-r--r--drivers/vhost/vsock.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/vhost/vsock.h b/drivers/vhost/vsock.h
deleted file mode 100644
index 0ddb107b86ca..000000000000
--- a/drivers/vhost/vsock.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef VHOST_VSOCK_H
-#define VHOST_VSOCK_H
-#define VHOST_VSOCK_SET_GUEST_CID _IOW(VHOST_VIRTIO, 0x60, __u32)
-#endif