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 /arch/sparc/include | |
| parent | dfd42facf1e4ada021b939b4e19c935dcdd55566 (diff) | |
| parent | 2a5c0fdc70cd653741e910e92ffeb2fa7376db07 (diff) | |
| download | linux-7e9c3cb5ee07cba2a058d2f010ca2a71a08309c8.tar.bz2 | |
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 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/uapi/asm/shmbuf.h | 5 | ||||
| -rw-r--r-- | arch/sparc/include/uapi/asm/signal.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/sparc/include/uapi/asm/shmbuf.h b/arch/sparc/include/uapi/asm/shmbuf.h index a5d7d8d681c4..ed4f061c7a15 100644 --- a/arch/sparc/include/uapi/asm/shmbuf.h +++ b/arch/sparc/include/uapi/asm/shmbuf.h @@ -2,6 +2,9 @@ #ifndef _SPARC_SHMBUF_H #define _SPARC_SHMBUF_H +#include <asm/ipcbuf.h> +#include <asm/posix_types.h> + /* * The shmid64_ds structure for sparc architecture. * Note extra padding because this structure is passed back and forth @@ -25,7 +28,7 @@ struct shmid64_ds { unsigned long shm_ctime_high; unsigned long shm_ctime; /* last change time */ #endif - size_t shm_segsz; /* size of segment (bytes) */ + __kernel_size_t shm_segsz; /* size of segment (bytes) */ __kernel_pid_t shm_cpid; /* pid of creator */ __kernel_pid_t shm_lpid; /* pid of last operator */ unsigned long shm_nattch; /* no. of current attaches */ diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h index 53758d53ac0e..d395af9b46d2 100644 --- a/arch/sparc/include/uapi/asm/signal.h +++ b/arch/sparc/include/uapi/asm/signal.h @@ -2,6 +2,7 @@ #ifndef _UAPI__SPARC_SIGNAL_H #define _UAPI__SPARC_SIGNAL_H +#include <asm/posix_types.h> #include <asm/sigcontext.h> #include <linux/compiler.h> @@ -171,7 +172,7 @@ struct __old_sigaction { typedef struct sigaltstack { void __user *ss_sp; int ss_flags; - size_t ss_size; + __kernel_size_t ss_size; } stack_t; |