Showing the changes to include/uapi (5 of 733 files). Show all
Unified · Split
| @@ -730,9 +730,11 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_mprotect) · 729 unmodified lines | ||
| 730 | 730 | __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) |
| 731 | 731 | #define __NR_pkey_free 290 |
| 732 | 732 | __SYSCALL(__NR_pkey_free, sys_pkey_free) |
| 733 | +#define __NR_statx 291 | |
| 734 | +__SYSCALL(__NR_statx, sys_statx) | |
| 733 | 735 | |
| 734 | 736 | #undef __NR_syscalls |
| 735 | −#define __NR_syscalls 291 | |
| 737 | +#define __NR_syscalls 292 | |
| 736 | 738 | |
| 737 | 739 | /* |
| 738 | 740 | * All syscalls below here should go away really, |
| @@ -33,8 +33,8 @@ extern "C" { · 32 unmodified lines | ||
| 33 | 33 | #define OMAP_PARAM_CHIPSET_ID 1 /* ie. 0x3430, 0x4430, etc */ |
| 34 | 34 | |
| 35 | 35 | struct drm_omap_param { |
| 36 | − uint64_t param; /* in */ | |
| 37 | − uint64_t value; /* in (set_param), out (get_param) */ | |
| 36 | + __u64 param; /* in */ | |
| 37 | + __u64 value; /* in (set_param), out (get_param) */ | |
| 38 | 38 | }; |
| 39 | 39 | |
| 40 | 40 | #define OMAP_BO_SCANOUT 0x00000001 /* scanout capable (phys contiguous) */ |
| @@ -53,18 +53,18 @@ struct drm_omap_param { · 12 unmodified lines | ||
| 53 | 53 | #define OMAP_BO_TILED (OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32) |
| 54 | 54 | |
| 55 | 55 | union omap_gem_size { |
| 56 | − uint32_t bytes; /* (for non-tiled formats) */ | |
| 56 | + __u32 bytes; /* (for non-tiled formats) */ | |
| 57 | 57 | struct { |
| 58 | − uint16_t width; | |
| 59 | − uint16_t height; | |
| 58 | + __u16 width; | |
| 59 | + __u16 height; | |
| 60 | 60 | } tiled; /* (for tiled formats) */ |
| 61 | 61 | }; |
| 62 | 62 | |
| 63 | 63 | struct drm_omap_gem_new { |
| 64 | 64 | union omap_gem_size size; /* in */ |
| 65 | − uint32_t flags; /* in */ | |
| 66 | − uint32_t handle; /* out */ | |
| 67 | − uint32_t __pad; | |
| 65 | + __u32 flags; /* in */ | |
| 66 | + __u32 handle; /* out */ | |
| 67 | + __u32 __pad; | |
| 68 | 68 | }; |
| 69 | 69 | |
| 70 | 70 | /* mask of operations: */ |
| @@ -74,33 +74,33 @@ enum omap_gem_op { · 3 unmodified lines | ||
| 74 | 74 | }; |
| 75 | 75 | |
| 76 | 76 | struct drm_omap_gem_cpu_prep { |
| 77 | − uint32_t handle; /* buffer handle (in) */ | |
| 78 | − uint32_t op; /* mask of omap_gem_op (in) */ | |
| 77 | + __u32 handle; /* buffer handle (in) */ | |
| 78 | + __u32 op; /* mask of omap_gem_op (in) */ | |
| 79 | 79 | }; |
| 80 | 80 | |
| 81 | 81 | struct drm_omap_gem_cpu_fini { |
| 82 | − uint32_t handle; /* buffer handle (in) */ | |
| 83 | − uint32_t op; /* mask of omap_gem_op (in) */ | |
| 82 | + __u32 handle; /* buffer handle (in) */ | |
| 83 | + __u32 op; /* mask of omap_gem_op (in) */ | |
| 84 | 84 | /* TODO maybe here we pass down info about what regions are touched |
| 85 | 85 | * by sw so we can be clever about cache ops? For now a placeholder, |
| 86 | 86 | * set to zero and we just do full buffer flush.. |
| 87 | 87 | */ |
| 88 | − uint32_t nregions; | |
| 89 | − uint32_t __pad; | |
| 88 | + __u32 nregions; | |
| 89 | + __u32 __pad; | |
| 90 | 90 | }; |
| 91 | 91 | |
| 92 | 92 | struct drm_omap_gem_info { |
| 93 | − uint32_t handle; /* buffer handle (in) */ | |
| 94 | − uint32_t pad; | |
| 95 | − uint64_t offset; /* mmap offset (out) */ | |
| 93 | + __u32 handle; /* buffer handle (in) */ | |
| 94 | + __u32 pad; | |
| 95 | + __u64 offset; /* mmap offset (out) */ | |
| 96 | 96 | /* note: in case of tiled buffers, the user virtual size can be |
| 97 | 97 | * different from the physical size (ie. how many pages are needed |
| 98 | 98 | * to back the object) which is returned in DRM_IOCTL_GEM_OPEN.. |
| 99 | 99 | * This size here is the one that should be used if you want to |
| 100 | 100 | * mmap() the buffer: |
| 101 | 101 | */ |
| 102 | − uint32_t size; /* virtual size for mmap'ing (out) */ | |
| 103 | − uint32_t __pad; | |
| 102 | + __u32 size; /* virtual size for mmap'ing (out) */ | |
| 103 | + __u32 __pad; | |
| 104 | 104 | }; |
| 105 | 105 | |
| 106 | 106 | #define DRM_OMAP_GET_PARAM 0x00 |
| @@ -713,33 +713,6 @@ enum btrfs_err_code { · 712 unmodified lines | ||
| 713 | 713 | BTRFS_ERROR_DEV_ONLY_WRITABLE, |
| 714 | 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 | 717 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ |
| 745 | 718 | struct btrfs_ioctl_vol_args) |
| @@ -64,7 +64,7 @@ struct packet_diag_mclist { · 63 unmodified lines | ||
| 64 | 64 | __u32 pdmc_count; |
| 65 | 65 | __u16 pdmc_type; |
| 66 | 66 | __u16 pdmc_alen; |
| 67 | − __u8 pdmc_addr[MAX_ADDR_LEN]; | |
| 67 | + __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */ | |
| 68 | 68 | }; |
| 69 | 69 | |
| 70 | 70 | struct packet_diag_ring { |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #define MLX5_ABI_USER_H |
| 35 | 35 | |
| 36 | 36 | #include <linux/types.h> |
| 37 | +#include <linux/if_ether.h> /* For ETH_ALEN. */ | |
| 37 | 38 | |
| 38 | 39 | enum { |
| 39 | 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 | 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 | 73 | struct mlx5_ib_alloc_ucontext_req_v2 { |