Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a223aa authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

asm-generic: Move common compat types to asm-generic/compat.h 



commit fb3739759474d150a9927b920a80ea2afb4c2a51 upstream.

While converting compat system call handlers to work on 32-bit
architectures, I found a number of types used in those handlers
that are identical between all architectures.

Let's move all the identical ones into asm-generic/compat.h to avoid
having to add even more identical definitions of those types.

For unknown reasons, mips defines __compat_gid32_t, __compat_uid32_t
and compat_caddr_t as signed, while all others have them unsigned.
This seems to be a mistake, but I'm leaving it alone here. The other
types all differ by size or alignment on at least on architecture.

compat_aio_context_t is currently defined in linux/compat.h but
also needed for compat_sys_io_getevents(), so let's move it into
the same place.

While we still have not decided whether the 32-bit time handling
will always use the compat syscalls, or in which form, I think this
is a useful cleanup that we can merge regardless.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Frank Scheiner <frank.scheiner@web.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05a68fe2

arch/arm64/include/asm/compat.h

+2 −18
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/sched.h>

#include <linux/sched/task_stack.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ		100

#ifdef __AARCH64EB__

#define COMPAT_UTS_MACHINE	"armv8b\0\0"
@@ -32,10 +34,6 @@ 
#define COMPAT_UTS_MACHINE	"armv8l\0\0"

#endif



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_clock_t;

typedef s32		compat_pid_t;

typedef u16		__compat_uid_t;

typedef u16		__compat_gid_t;

typedef u16		__compat_uid16_t;
@@ -43,27 +41,13 @@ typedef u16 __compat_gid16_t; 
typedef u32		__compat_uid32_t;

typedef u32		__compat_gid32_t;

typedef u16		compat_mode_t;

typedef u32		compat_ino_t;

typedef u32		compat_dev_t;

typedef s32		compat_off_t;

typedef s64		compat_loff_t;

typedef s32		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef s32		compat_daddr_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s32		compat_key_t;

typedef s32		compat_timer_t;



typedef s16		compat_short_t;

typedef s32		compat_int_t;

typedef s32		compat_long_t;

typedef s64		compat_s64;

typedef u16		compat_ushort_t;

typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_stat {

#ifdef __AARCH64EB__

arch/mips/include/asm/compat.h

+2 −20
Original line number Diff line number Diff line
@@ -9,43 +9,25 @@ 
#include <asm/page.h>

#include <asm/ptrace.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"mips\0\0\0"



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_clock_t;

typedef s32		compat_suseconds_t;



typedef s32		compat_pid_t;

typedef s32		__compat_uid_t;

typedef s32		__compat_gid_t;

typedef __compat_uid_t	__compat_uid32_t;

typedef __compat_gid_t	__compat_gid32_t;

typedef u32		compat_mode_t;

typedef u32		compat_ino_t;

typedef u32		compat_dev_t;

typedef s32		compat_off_t;

typedef s64		compat_loff_t;

typedef u32		compat_nlink_t;

typedef s32		compat_ipc_pid_t;

typedef s32		compat_daddr_t;

typedef s32		compat_caddr_t;

typedef struct {

	s32	val[2];

} compat_fsid_t;

typedef s32		compat_timer_t;

typedef s32		compat_key_t;



typedef s16		compat_short_t;

typedef s32		compat_int_t;

typedef s32		compat_long_t;

typedef s64		compat_s64;

typedef u16		compat_ushort_t;

typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_stat {

	compat_dev_t	st_dev;

arch/parisc/include/asm/compat.h

+2 −16
Original line number Diff line number Diff line
@@ -8,36 +8,22 @@ 
#include <linux/sched.h>

#include <linux/thread_info.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ 		100

#define COMPAT_UTS_MACHINE	"parisc\0\0"



typedef u32	compat_size_t;

typedef s32	compat_ssize_t;

typedef s32	compat_clock_t;

typedef s32	compat_pid_t;

typedef u32	__compat_uid_t;

typedef u32	__compat_gid_t;

typedef u32	__compat_uid32_t;

typedef u32	__compat_gid32_t;

typedef u16	compat_mode_t;

typedef u32	compat_ino_t;

typedef u32	compat_dev_t;

typedef s32	compat_off_t;

typedef s64	compat_loff_t;

typedef u16	compat_nlink_t;

typedef u16	compat_ipc_pid_t;

typedef s32	compat_daddr_t;

typedef u32	compat_caddr_t;

typedef s32	compat_key_t;

typedef s32	compat_timer_t;



typedef s32	compat_int_t;

typedef s32	compat_long_t;

typedef s64	compat_s64;

typedef u32	compat_uint_t;

typedef u32	compat_ulong_t;

typedef u64	compat_u64;

typedef u32	compat_uptr_t;



struct compat_stat {

	compat_dev_t		st_dev;	/* dev_t is 32 bits on parisc */

arch/powerpc/include/asm/compat.h

+2 −16
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include <linux/types.h>

#include <linux/sched.h>



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ		100

#ifdef __BIG_ENDIAN__

#define COMPAT_UTS_MACHINE	"ppc\0\0"
@@ -15,34 +17,18 @@ 
#define COMPAT_UTS_MACHINE	"ppcle\0\0"

#endif



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_clock_t;

typedef s32		compat_pid_t;

typedef u32		__compat_uid_t;

typedef u32		__compat_gid_t;

typedef u32		__compat_uid32_t;

typedef u32		__compat_gid32_t;

typedef u32		compat_mode_t;

typedef u32		compat_ino_t;

typedef u32		compat_dev_t;

typedef s32		compat_off_t;

typedef s64		compat_loff_t;

typedef s16		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef s32		compat_daddr_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s32		compat_key_t;

typedef s32		compat_timer_t;



typedef s32		compat_int_t;

typedef s32		compat_long_t;

typedef s64		compat_s64;

typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_stat {

	compat_dev_t	st_dev;

arch/s390/include/asm/compat.h

+2 −16
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <linux/sched/task_stack.h>

#include <linux/thread_info.h>



#include <asm-generic/compat.h>



#define __TYPE_IS_PTR(t) (!__builtin_types_compatible_p( \

				typeof(0?(__force t)0:0ULL), u64))
@@ -51,34 +53,18 @@ 
#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"s390\0\0\0\0"



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_clock_t;

typedef s32		compat_pid_t;

typedef u16		__compat_uid_t;

typedef u16		__compat_gid_t;

typedef u32		__compat_uid32_t;

typedef u32		__compat_gid32_t;

typedef u16		compat_mode_t;

typedef u32		compat_ino_t;

typedef u16		compat_dev_t;

typedef s32		compat_off_t;

typedef s64		compat_loff_t;

typedef u16		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef s32		compat_daddr_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;

typedef s32		compat_key_t;

typedef s32		compat_timer_t;



typedef s32		compat_int_t;

typedef s32		compat_long_t;

typedef s64		compat_s64;

typedef u32		compat_uint_t;

typedef u32		compat_ulong_t;

typedef u64		compat_u64;

typedef u32		compat_uptr_t;



typedef struct {

	u32 mask;