Merge tag 'kvm-arm-for-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
KVM/ARM changes for Linux v4.5 - Complete rewrite of the arm64 world switch in C, hopefully paving the way for more sharing with the 32bit code, better maintainability and easier integration of new features. Also smaller and slightly faster in some cases... - Support for 16bit VM identifiers - Various cleanups
This commit is contained in:
@@ -33,17 +33,6 @@
|
||||
|
||||
#define NFS_PIPE_DIRNAME "nfs"
|
||||
|
||||
/* NFS ioctls */
|
||||
/* Let's follow btrfs lead on CLONE to avoid messing userspace */
|
||||
#define NFS_IOC_CLONE _IOW(0x94, 9, int)
|
||||
#define NFS_IOC_CLONE_RANGE _IOW(0x94, 13, int)
|
||||
|
||||
struct nfs_ioctl_clone_range_args {
|
||||
__s64 src_fd;
|
||||
__u64 src_off, count;
|
||||
__u64 dst_off;
|
||||
};
|
||||
|
||||
/*
|
||||
* NFS stats. The good thing with these values is that NFSv3 errors are
|
||||
* a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
|
||||
|
@@ -38,13 +38,6 @@
|
||||
|
||||
#define VFIO_SPAPR_TCE_v2_IOMMU 7
|
||||
|
||||
/*
|
||||
* The No-IOMMU IOMMU offers no translation or isolation for devices and
|
||||
* supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
|
||||
* code will taint the host kernel and should be used with extreme caution.
|
||||
*/
|
||||
#define VFIO_NOIOMMU_IOMMU 8
|
||||
|
||||
/*
|
||||
* The IOCTL interface is designed for extensibility by embedding the
|
||||
* structure length (argsz) and flags into structures passed between
|
||||
|
Reference in New Issue
Block a user