History

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

Paolo Bonzini committed 10 years ago

Commit def840e2 parents 7749266 c7da6fa836 files · +11543 −6814Browse files

Showing the changes to include/uapi (2 of 836 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nfs.h +0 −11
  2. include/uapi/linux/vfio.h +0 −7
include/uapi/linux/nfs.h+0−11
@@ -33,17 +33,6 @@ · 32 unmodified lines
33 33
34#define NFS_PIPE_DIRNAME "nfs"34#define NFS_PIPE_DIRNAME "nfs"
35 35
36/* NFS ioctls */
37/* Let's follow btrfs lead on CLONE to avoid messing userspace */
38#define NFS_IOC_CLONE _IOW(0x94, 9, int)
39#define NFS_IOC_CLONE_RANGE _IOW(0x94, 13, int)
40
41struct nfs_ioctl_clone_range_args {
42 __s64 src_fd;
43 __u64 src_off, count;
44 __u64 dst_off;
45};
46
47/*36/*
48 * NFS stats. The good thing with these values is that NFSv3 errors are37 * NFS stats. The good thing with these values is that NFSv3 errors are
49 * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which38 * a superset of NFSv2 errors (with the exception of NFSERR_WFLUSH which
include/uapi/linux/vfio.h+0−7
@@ -38,13 +38,6 @@ · 37 unmodified lines
38 38
39#define VFIO_SPAPR_TCE_v2_IOMMU 739#define VFIO_SPAPR_TCE_v2_IOMMU 7
40 40
41/*
42 * The No-IOMMU IOMMU offers no translation or isolation for devices and
43 * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
44 * code will taint the host kernel and should be used with extreme caution.
45 */
46#define VFIO_NOIOMMU_IOMMU 8
47
48/*41/*
49 * The IOCTL interface is designed for extensibility by embedding the42 * The IOCTL interface is designed for extensibility by embedding the
50 * structure length (argsz) and flags into structures passed between43 * structure length (argsz) and flags into structures passed between

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t