Commit 1a33b18b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

compat: make linux/compat.h available everywhere 



Parts of linux/compat.h are under an #ifdef, but we end up
using more of those over time, moving things around bit by
bit.

To get it over with once and for all, make all of this file
uncondititonal now so it can be accessed everywhere. There
are only a few types left that are in asm/compat.h but not
yet in the asm-generic version, so add those in the process.

This requires providing a few more types in asm-generic/compat.h
that were not already there. The only tricky one is
compat_sigset_t, which needs a little help on 32-bit architectures
and for x86.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4431531c

arch/arm64/include/asm/compat.h

+3 −11
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
#ifndef __ASM_COMPAT_H

#define __ASM_COMPAT_H



#define compat_mode_t compat_mode_t

typedef u16		compat_mode_t;



#include <asm-generic/compat.h>



#ifdef CONFIG_COMPAT
@@ -27,13 +30,9 @@ typedef u16 __compat_uid_t; 
typedef u16		__compat_gid_t;

typedef u16		__compat_uid16_t;

typedef u16		__compat_gid16_t;

typedef u32		__compat_uid32_t;

typedef u32		__compat_gid32_t;

typedef u16		compat_mode_t;

typedef u32		compat_dev_t;

typedef s32		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;



struct compat_stat {
@@ -103,13 +102,6 @@ struct compat_statfs { 


#define COMPAT_RLIM_INFINITY		0xffffffff



typedef u32		compat_old_sigset_t;



#define _COMPAT_NSIG		64

#define _COMPAT_NSIG_BPW	32



typedef u32		compat_sigset_word;



#define COMPAT_OFF_T_MAX	0x7fffffff



#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))

arch/mips/include/asm/compat.h

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

#include <asm/ptrace.h>



typedef s32		__compat_uid_t;

typedef s32		__compat_gid_t;

typedef __compat_uid_t	__compat_uid32_t;

typedef __compat_gid_t	__compat_gid32_t;

#define __compat_uid32_t __compat_uid32_t

#define __compat_gid32_t __compat_gid32_t



#define _COMPAT_NSIG		128		/* Don't ask !$@#% ...	*/

#define _COMPAT_NSIG_BPW	32

typedef u32		compat_sigset_word;



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ		100

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



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_dev_t;

typedef u32		compat_nlink_t;

typedef s32		compat_ipc_pid_t;

typedef s32		compat_caddr_t;

typedef struct {

	s32	val[2];

} compat_fsid_t;
@@ -89,13 +94,6 @@ struct compat_statfs { 


#define COMPAT_RLIM_INFINITY	0x7fffffffUL



typedef u32		compat_old_sigset_t;	/* at least 32 bits */



#define _COMPAT_NSIG		128		/* Don't ask !$@#% ...	*/

#define _COMPAT_NSIG_BPW	32



typedef u32		compat_sigset_word;



#define COMPAT_OFF_T_MAX	0x7fffffff



static inline void __user *arch_compat_alloc_user_space(long len)

arch/parisc/include/asm/compat.h

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

#include <linux/thread_info.h>



#define compat_mode_t compat_mode_t

typedef u16	compat_mode_t;



#include <asm-generic/compat.h>



#define COMPAT_USER_HZ 		100
@@ -15,13 +18,9 @@ 


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_dev_t;

typedef u16	compat_nlink_t;

typedef u16	compat_ipc_pid_t;

typedef u32	compat_caddr_t;



struct compat_stat {

	compat_dev_t		st_dev;	/* dev_t is 32 bits on parisc */
@@ -96,13 +95,6 @@ struct compat_sigcontext { 


#define COMPAT_RLIM_INFINITY 0xffffffff



typedef u32		compat_old_sigset_t;	/* at least 32 bits */



#define _COMPAT_NSIG		64

#define _COMPAT_NSIG_BPW	32



typedef u32		compat_sigset_word;



#define COMPAT_OFF_T_MAX	0x7fffffff



struct compat_ipc64_perm {

arch/powerpc/include/asm/compat.h

+0 −11
Original line number Diff line number Diff line
@@ -19,13 +19,9 @@ 


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_dev_t;

typedef s16		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;



struct compat_stat {
@@ -85,13 +81,6 @@ struct compat_statfs { 


#define COMPAT_RLIM_INFINITY		0xffffffff



typedef u32		compat_old_sigset_t;



#define _COMPAT_NSIG		64

#define _COMPAT_NSIG_BPW	32



typedef u32		compat_sigset_word;



#define COMPAT_OFF_T_MAX	0x7fffffff



static inline void __user *arch_compat_alloc_user_space(long len)

arch/s390/include/asm/compat.h

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

#include <linux/thread_info.h>



#define compat_mode_t	compat_mode_t

typedef u16		compat_mode_t;



#include <asm-generic/compat.h>



#define __TYPE_IS_PTR(t) (!__builtin_types_compatible_p( \
@@ -55,13 +58,9 @@ 


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 u16		compat_dev_t;

typedef u16		compat_nlink_t;

typedef u16		compat_ipc_pid_t;

typedef u32		compat_caddr_t;

typedef __kernel_fsid_t	compat_fsid_t;



typedef struct {
@@ -155,13 +154,6 @@ struct compat_statfs64 { 


#define COMPAT_RLIM_INFINITY		0xffffffff



typedef u32		compat_old_sigset_t;	/* at least 32 bits */



#define _COMPAT_NSIG		64

#define _COMPAT_NSIG_BPW	32



typedef u32		compat_sigset_word;



#define COMPAT_OFF_T_MAX	0x7fffffff



/*