We need the char-misc fixes in here as well.
Showing the changes to include/uapi/linux (6 of 1169 files). Show all
Unified · Split
| @@ -4,8 +4,8 @@ · 3 unmodified lines | ||
| 4 | 4 | * |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | −#ifndef _UAPI_LINUX_BINDER_CTL_H | |
| 8 | −#define _UAPI_LINUX_BINDER_CTL_H | |
| 7 | +#ifndef _UAPI_LINUX_BINDERFS_H | |
| 8 | +#define _UAPI_LINUX_BINDERFS_H | |
| 9 | 9 | |
| 10 | 10 | #include <linux/android/binder.h> |
| 11 | 11 | #include <linux/types.h> |
| @@ -22,8 +22,8 @@ · 10 unmodified lines | ||
| 22 | 22 | */ |
| 23 | 23 | struct binderfs_device { |
| 24 | 24 | char name[BINDERFS_MAX_NAME + 1]; |
| 25 | − __u8 major; | |
| 26 | − __u8 minor; | |
| 25 | + __u32 major; | |
| 26 | + __u32 minor; | |
| 27 | 27 | }; |
| 28 | 28 | |
| 29 | 29 | /** |
| @@ -31,5 +31,5 @@ struct binderfs_device { · 1 unmodified line | ||
| 31 | 31 | */ |
| 32 | 32 | #define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device) |
| 33 | 33 | |
| 34 | −#endif /* _UAPI_LINUX_BINDER_CTL_H */ | |
| 34 | +#endif /* _UAPI_LINUX_BINDERFS_H */ | |
| 35 | 35 | |
| @@ -400,6 +400,8 @@ enum { · 399 unmodified lines | ||
| 400 | 400 | /* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */ |
| 401 | 401 | #define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT) |
| 402 | 402 | #define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) |
| 403 | +#define AUDIT_ARCH_RISCV32 (EM_RISCV|__AUDIT_ARCH_LE) | |
| 404 | +#define AUDIT_ARCH_RISCV64 (EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) | |
| 403 | 405 | #define AUDIT_ARCH_S390 (EM_S390) |
| 404 | 406 | #define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT) |
| 405 | 407 | #define AUDIT_ARCH_SH (EM_SH) |
| @@ -138,6 +138,7 @@ struct blk_zone_range { · 137 unmodified lines | ||
| 138 | 138 | * @BLKRESETZONE: Reset the write pointer of the zones in the specified |
| 139 | 139 | * sector range. The sector range must be zone aligned. |
| 140 | 140 | * @BLKGETZONESZ: Get the device zone size in number of 512 B sectors. |
| 141 | + * @BLKGETNRZONES: Get the total number of zones of the device. | |
| 141 | 142 | */ |
| 142 | 143 | #define BLKREPORTZONE _IOWR(0x12, 130, struct blk_zone_report) |
| 143 | 144 | #define BLKRESETZONE _IOW(0x12, 131, struct blk_zone_range) |
| @@ -268,7 +268,7 @@ struct sockaddr_in { · 267 unmodified lines | ||
| 268 | 268 | #define IN_MULTICAST(a) IN_CLASSD(a) |
| 269 | 269 | #define IN_MULTICAST_NET 0xe0000000 |
| 270 | 270 | |
| 271 | −#define IN_BADCLASS(a) ((((long int) (a) ) == 0xffffffff) | |
| 271 | +#define IN_BADCLASS(a) (((long int) (a) ) == (long int)0xffffffff) | |
| 272 | 272 | #define IN_EXPERIMENTAL(a) IN_BADCLASS((a)) |
| 273 | 273 | |
| 274 | 274 | #define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000) |
| @@ -26,13 +26,17 @@ · 25 unmodified lines | ||
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | 28 | struct input_event { |
| 29 | −#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL) | |
| 29 | +#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__) | |
| 30 | 30 | struct timeval time; |
| 31 | 31 | #define input_event_sec time.tv_sec |
| 32 | 32 | #define input_event_usec time.tv_usec |
| 33 | 33 | #else |
| 34 | 34 | __kernel_ulong_t __sec; |
| 35 | +#if defined(__sparc__) && defined(__arch64__) | |
| 36 | + unsigned int __usec; | |
| 37 | +#else | |
| 35 | 38 | __kernel_ulong_t __usec; |
| 39 | +#endif | |
| 36 | 40 | #define input_event_sec __sec |
| 37 | 41 | #define input_event_usec __usec |
| 38 | 42 | #endif |
| @@ -147,7 +147,7 @@ struct ptp_pin_desc { · 146 unmodified lines | ||
| 147 | 147 | #define PTP_SYS_OFFSET_PRECISE \ |
| 148 | 148 | _IOWR(PTP_CLK_MAGIC, 8, struct ptp_sys_offset_precise) |
| 149 | 149 | #define PTP_SYS_OFFSET_EXTENDED \ |
| 150 | − _IOW(PTP_CLK_MAGIC, 9, struct ptp_sys_offset_extended) | |
| 150 | + _IOWR(PTP_CLK_MAGIC, 9, struct ptp_sys_offset_extended) | |
| 151 | 151 | |
| 152 | 152 | struct ptp_extts_event { |
| 153 | 153 | struct ptp_clock_time t; /* Time event occured. */ |