diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-02-17 09:10:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-02-17 09:11:24 +0100 |
| commit | 7e9c3cb5ee07cba2a058d2f010ca2a71a08309c8 (patch) | |
| tree | f9a55f46c10ba4b5a72f5bd7b2a4b450459f5ca2 /include/uapi/linux | |
| parent | dfd42facf1e4ada021b939b4e19c935dcdd55566 (diff) | |
| parent | 2a5c0fdc70cd653741e910e92ffeb2fa7376db07 (diff) | |
Merge branch 'asm-generic-compile-test' into asm-generic
This series from Masahiro Yamada cleans up some of the kernel headers
to build cleanly as part of the UAPI checks.
Link: https://lore.kernel.org/lkml/20220210021129.3386083-1-masahiroy@kernel.org/#t
* asm-generic-compile-test:
reiserfs_xattr.h: add linux/reiserfs_xattr.h to UAPI compile-test coverage
kexec.h: add linux/kexec.h to UAPI compile-test coverage
fsmap.h: add linux/fsmap.h to UAPI compile-test coverage
android/binder.h: add linux/android/binder(fs).h to UAPI compile-test coverage
shmbuf.h: add asm/shmbuf.h to UAPI compile-test coverage
signal.h: add linux/signal.h and asm/signal.h to UAPI compile-test coverage
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/android/binder.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/fsmap.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/kexec.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/reiserfs_xattr.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h index 3246f2c74696..11157fae8a8e 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -288,8 +288,8 @@ struct binder_transaction_data { /* General information about the transaction. */ __u32 flags; - pid_t sender_pid; - uid_t sender_euid; + __kernel_pid_t sender_pid; + __kernel_uid_t sender_euid; binder_size_t data_size; /* number of bytes of data */ binder_size_t offsets_size; /* number of bytes of offsets */ diff --git a/include/uapi/linux/fsmap.h b/include/uapi/linux/fsmap.h index 91fd519a3f7d..c690d17f1d07 100644 --- a/include/uapi/linux/fsmap.h +++ b/include/uapi/linux/fsmap.h @@ -69,7 +69,7 @@ struct fsmap_head { }; /* Size of an fsmap_head with room for nr records. */ -static inline size_t +static inline __kernel_size_t fsmap_sizeof( unsigned int nr) { diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h index 778dc191c265..fb7e2ef60825 100644 --- a/include/uapi/linux/kexec.h +++ b/include/uapi/linux/kexec.h @@ -54,9 +54,9 @@ */ struct kexec_segment { const void *buf; - size_t bufsz; + __kernel_size_t bufsz; const void *mem; - size_t memsz; + __kernel_size_t memsz; }; #endif /* __KERNEL__ */ diff --git a/include/uapi/linux/reiserfs_xattr.h b/include/uapi/linux/reiserfs_xattr.h index 28f10842f047..503ad018ce5b 100644 --- a/include/uapi/linux/reiserfs_xattr.h +++ b/include/uapi/linux/reiserfs_xattr.h @@ -19,7 +19,7 @@ struct reiserfs_xattr_header { struct reiserfs_security_handle { const char *name; void *value; - size_t length; + __kernel_size_t length; }; #endif /* _LINUX_REISERFS_XATTR_H */ |