Linux 4.11-rc5 * tag 'v4.11-rc5': (1168 commits) Linux 4.11-rc5 tty: pl011: fix earlycon work-around for QDF2400 erratum 44 kasan: do not sanitize kexec purgatory drivers/rapidio/devices/tsi721.c: make module parameter variable name unique mm/hugetlb.c: don't call region_abort if region_chg fails kasan: report only the first error by default hugetlbfs: initialize shared policy as part of inode allocation mm: fix section name for .data..ro_after_init mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() mm: workingset: fix premature shadow node shrinking with cgroups mm: rmap: fix huge file mmap accounting in the memcg stats mm: move mm_percpu_wq initialization earlier mm: migrate: fix remove_migration_pte() for ksm pages nfs: flexfiles: fix kernel OOPS if MDS returns unsupported DS type NFSv4.1 fix infinite loop on IO BAD_STATEID error serial: 8250_EXAR: fix duplicate Kconfig text and add missing help text tty/serial: atmel: fix TX path in atmel_console_write() tty/serial: atmel: fix race condition (TX+DMA) serial: mxs-auart: Fix baudrate calculation irqchip/mips-gic: Fix Local compare interrupt ...
Showing the changes to include/uapi (6 of 1235 files). Show all
Unified · Split
| @@ -730,9 +730,11 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect) · 729 unmodified lines | |||
| 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) | 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) |
| 731 | #define __NR_pkey_free 290 | 731 | #define __NR_pkey_free 290 |
| 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) | 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) |
| 733 | #define __NR_statx 291 | ||
| 734 | __SYSCALL(__NR_statx, sys_statx) | ||
| 733 | 735 | ||
| 734 | #undef __NR_syscalls | 736 | #undef __NR_syscalls |
| 735 | #define __NR_syscalls 291 | 737 | #define __NR_syscalls 292 |
| 736 | 738 | ||
| 737 | /* | 739 | /* |
| 738 | * All syscalls below here should go away really, | 740 | * All syscalls below here should go away really, |
| @@ -33,8 +33,8 @@ extern "C" { · 32 unmodified lines | |||
| 33 | #define OMAP_PARAM_CHIPSET_ID 1 /* ie. 0x3430, 0x4430, etc */ | 33 | #define OMAP_PARAM_CHIPSET_ID 1 /* ie. 0x3430, 0x4430, etc */ |
| 34 | 34 | ||
| 35 | struct drm_omap_param { | 35 | struct drm_omap_param { |
| 36 | uint64_t param; /* in */ | 36 | __u64 param; /* in */ |
| 37 | uint64_t value; /* in (set_param), out (get_param) */ | 37 | __u64 value; /* in (set_param), out (get_param) */ |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | #define OMAP_BO_SCANOUT 0x00000001 /* scanout capable (phys contiguous) */ | 40 | #define OMAP_BO_SCANOUT 0x00000001 /* scanout capable (phys contiguous) */ |
| @@ -53,18 +53,18 @@ struct drm_omap_param { · 12 unmodified lines | |||
| 53 | #define OMAP_BO_TILED (OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32) | 53 | #define OMAP_BO_TILED (OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32) |
| 54 | 54 | ||
| 55 | union omap_gem_size { | 55 | union omap_gem_size { |
| 56 | uint32_t bytes; /* (for non-tiled formats) */ | 56 | __u32 bytes; /* (for non-tiled formats) */ |
| 57 | struct { | 57 | struct { |
| 58 | uint16_t width; | 58 | __u16 width; |
| 59 | uint16_t height; | 59 | __u16 height; |
| 60 | } tiled; /* (for tiled formats) */ | 60 | } tiled; /* (for tiled formats) */ |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | struct drm_omap_gem_new { | 63 | struct drm_omap_gem_new { |
| 64 | union omap_gem_size size; /* in */ | 64 | union omap_gem_size size; /* in */ |
| 65 | uint32_t flags; /* in */ | 65 | __u32 flags; /* in */ |
| 66 | uint32_t handle; /* out */ | 66 | __u32 handle; /* out */ |
| 67 | uint32_t __pad; | 67 | __u32 __pad; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | /* mask of operations: */ | 70 | /* mask of operations: */ |
| @@ -74,33 +74,33 @@ enum omap_gem_op { · 3 unmodified lines | |||
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | struct drm_omap_gem_cpu_prep { | 76 | struct drm_omap_gem_cpu_prep { |
| 77 | uint32_t handle; /* buffer handle (in) */ | 77 | __u32 handle; /* buffer handle (in) */ |
| 78 | uint32_t op; /* mask of omap_gem_op (in) */ | 78 | __u32 op; /* mask of omap_gem_op (in) */ |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | struct drm_omap_gem_cpu_fini { | 81 | struct drm_omap_gem_cpu_fini { |
| 82 | uint32_t handle; /* buffer handle (in) */ | 82 | __u32 handle; /* buffer handle (in) */ |
| 83 | uint32_t op; /* mask of omap_gem_op (in) */ | 83 | __u32 op; /* mask of omap_gem_op (in) */ |
| 84 | /* TODO maybe here we pass down info about what regions are touched | 84 | /* TODO maybe here we pass down info about what regions are touched |
| 85 | * by sw so we can be clever about cache ops? For now a placeholder, | 85 | * by sw so we can be clever about cache ops? For now a placeholder, |
| 86 | * set to zero and we just do full buffer flush.. | 86 | * set to zero and we just do full buffer flush.. |
| 87 | */ | 87 | */ |
| 88 | uint32_t nregions; | 88 | __u32 nregions; |
| 89 | uint32_t __pad; | 89 | __u32 __pad; |
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| 92 | struct drm_omap_gem_info { | 92 | struct drm_omap_gem_info { |
| 93 | uint32_t handle; /* buffer handle (in) */ | 93 | __u32 handle; /* buffer handle (in) */ |
| 94 | uint32_t pad; | 94 | __u32 pad; |
| 95 | uint64_t offset; /* mmap offset (out) */ | 95 | __u64 offset; /* mmap offset (out) */ |
| 96 | /* note: in case of tiled buffers, the user virtual size can be | 96 | /* note: in case of tiled buffers, the user virtual size can be |
| 97 | * different from the physical size (ie. how many pages are needed | 97 | * different from the physical size (ie. how many pages are needed |
| 98 | * to back the object) which is returned in DRM_IOCTL_GEM_OPEN.. | 98 | * to back the object) which is returned in DRM_IOCTL_GEM_OPEN.. |
| 99 | * This size here is the one that should be used if you want to | 99 | * This size here is the one that should be used if you want to |
| 100 | * mmap() the buffer: | 100 | * mmap() the buffer: |
| 101 | */ | 101 | */ |
| 102 | uint32_t size; /* virtual size for mmap'ing (out) */ | 102 | __u32 size; /* virtual size for mmap'ing (out) */ |
| 103 | uint32_t __pad; | 103 | __u32 __pad; |
| 104 | }; | 104 | }; |
| 105 | 105 | ||
| 106 | #define DRM_OMAP_GET_PARAM 0x00 | 106 | #define DRM_OMAP_GET_PARAM 0x00 |
| @@ -713,33 +713,6 @@ enum btrfs_err_code { · 712 unmodified lines | |||
| 713 | BTRFS_ERROR_DEV_ONLY_WRITABLE, | 713 | BTRFS_ERROR_DEV_ONLY_WRITABLE, |
| 714 | BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS | 714 | BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS |
| 715 | }; | 715 | }; |
| 716 | /* An error code to error string mapping for the kernel | ||
| 717 | * error codes | ||
| 718 | */ | ||
| 719 | static inline char *btrfs_err_str(enum btrfs_err_code err_code) | ||
| 720 | { | ||
| 721 | switch (err_code) { | ||
| 722 | case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: | ||
| 723 | return "unable to go below two devices on raid1"; | ||
| 724 | case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET: | ||
| 725 | return "unable to go below four devices on raid10"; | ||
| 726 | case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: | ||
| 727 | return "unable to go below two devices on raid5"; | ||
| 728 | case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET: | ||
| 729 | return "unable to go below three devices on raid6"; | ||
| 730 | case BTRFS_ERROR_DEV_TGT_REPLACE: | ||
| 731 | return "unable to remove the dev_replace target dev"; | ||
| 732 | case BTRFS_ERROR_DEV_MISSING_NOT_FOUND: | ||
| 733 | return "no missing devices found to remove"; | ||
| 734 | case BTRFS_ERROR_DEV_ONLY_WRITABLE: | ||
| 735 | return "unable to remove the only writeable device"; | ||
| 736 | case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS: | ||
| 737 | return "add/delete/balance/replace/resize operation "\ | ||
| 738 | "in progress"; | ||
| 739 | default: | ||
| 740 | return NULL; | ||
| 741 | } | ||
| 742 | } | ||
| 743 | 716 | ||
| 744 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ | 717 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ |
| 745 | struct btrfs_ioctl_vol_args) | 718 | struct btrfs_ioctl_vol_args) |
| @@ -64,7 +64,7 @@ struct packet_diag_mclist { · 63 unmodified lines | |||
| 64 | __u32 pdmc_count; | 64 | __u32 pdmc_count; |
| 65 | __u16 pdmc_type; | 65 | __u16 pdmc_type; |
| 66 | __u16 pdmc_alen; | 66 | __u16 pdmc_alen; |
| 67 | __u8 pdmc_addr[MAX_ADDR_LEN]; | 67 | __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */ |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | struct packet_diag_ring { | 70 | struct packet_diag_ring { |
| @@ -18,8 +18,7 @@ · 17 unmodified lines | |||
| 18 | * means the userland is reading). | 18 | * means the userland is reading). |
| 19 | */ | 19 | */ |
| 20 | #define UFFD_API ((__u64)0xAA) | 20 | #define UFFD_API ((__u64)0xAA) |
| 21 | #define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_EXIT | \ | 21 | #define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK | \ |
| 22 | UFFD_FEATURE_EVENT_FORK | \ | ||
| 23 | UFFD_FEATURE_EVENT_REMAP | \ | 22 | UFFD_FEATURE_EVENT_REMAP | \ |
| 24 | UFFD_FEATURE_EVENT_REMOVE | \ | 23 | UFFD_FEATURE_EVENT_REMOVE | \ |
| 25 | UFFD_FEATURE_EVENT_UNMAP | \ | 24 | UFFD_FEATURE_EVENT_UNMAP | \ |
| @@ -113,7 +112,6 @@ struct uffd_msg { · 87 unmodified lines | |||
| 113 | #define UFFD_EVENT_REMAP 0x14 | 112 | #define UFFD_EVENT_REMAP 0x14 |
| 114 | #define UFFD_EVENT_REMOVE 0x15 | 113 | #define UFFD_EVENT_REMOVE 0x15 |
| 115 | #define UFFD_EVENT_UNMAP 0x16 | 114 | #define UFFD_EVENT_UNMAP 0x16 |
| 116 | #define UFFD_EVENT_EXIT 0x17 | ||
| 117 | 115 | ||
| 118 | /* flags for UFFD_EVENT_PAGEFAULT */ | 116 | /* flags for UFFD_EVENT_PAGEFAULT */ |
| 119 | #define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */ | 117 | #define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */ |
| @@ -163,7 +161,6 @@ struct uffdio_api { · 43 unmodified lines | |||
| 163 | #define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4) | 161 | #define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4) |
| 164 | #define UFFD_FEATURE_MISSING_SHMEM (1<<5) | 162 | #define UFFD_FEATURE_MISSING_SHMEM (1<<5) |
| 165 | #define UFFD_FEATURE_EVENT_UNMAP (1<<6) | 163 | #define UFFD_FEATURE_EVENT_UNMAP (1<<6) |
| 166 | #define UFFD_FEATURE_EVENT_EXIT (1<<7) | ||
| 167 | __u64 features; | 164 | __u64 features; |
| 168 | 165 | ||
| 169 | __u64 ioctls; | 166 | __u64 ioctls; |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | |||
| 34 | #define MLX5_ABI_USER_H | 34 | #define MLX5_ABI_USER_H |
| 35 | 35 | ||
| 36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 37 | #include <linux/if_ether.h> /* For ETH_ALEN. */ | ||
| 37 | 38 | ||
| 38 | enum { | 39 | enum { |
| 39 | MLX5_QP_FLAG_SIGNATURE = 1 << 0, | 40 | MLX5_QP_FLAG_SIGNATURE = 1 << 0, |
| @@ -66,7 +67,7 @@ struct mlx5_ib_alloc_ucontext_req { · 26 unmodified lines | |||
| 66 | }; | 67 | }; |
| 67 | 68 | ||
| 68 | enum mlx5_lib_caps { | 69 | enum mlx5_lib_caps { |
| 69 | MLX5_LIB_CAP_4K_UAR = (u64)1 << 0, | 70 | MLX5_LIB_CAP_4K_UAR = (__u64)1 << 0, |
| 70 | }; | 71 | }; |
| 71 | 72 | ||
| 72 | struct mlx5_ib_alloc_ucontext_req_v2 { | 73 | struct mlx5_ib_alloc_ucontext_req_v2 { |