Commit fcdc03f7 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/compat: cleanup compat_linux.h header file 



Remove various declarations from former s390 specific compat system
calls which have been removed with commit fef747ba ("s390: use
generic UID16 implementation"). While at it clean up the whole small
header file.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 29b06ad7

arch/s390/kernel/compat_linux.h

+28 −52
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ 
#include <linux/syscalls.h>

#include <asm/ptrace.h>



/* Macro that masks the high order bit of an 32 bit pointer and converts it*/

/*       to a 64 bit pointer */

/*

 * Macro that masks the high order bit of a 32 bit pointer and

 * converts it to a 64 bit pointer.

 */

#define A(__x)	((unsigned long)((__x) & 0x7FFFFFFFUL))

#define AA(__x)				\

	((unsigned long)(__x))

#define AA(__x)	((unsigned long)(__x))



/* Now 32bit compatibility types */

struct ipc_kludge_32 {
@@ -20,34 +21,29 @@ struct ipc_kludge_32 { 
};



/* asm/sigcontext.h */

typedef union

{

typedef union {

	__u64	d;

	__u32	f;

} freg_t32;



typedef struct

{

typedef struct {

	unsigned int	fpc;

	unsigned int	pad;

	freg_t32	fprs[__NUM_FPRS];

} _s390_fp_regs32;



typedef struct

{

typedef struct {

	psw_t32		psw;

	__u32		gprs[__NUM_GPRS];

	__u32		acrs[__NUM_ACRS];

} _s390_regs_common32;



typedef struct

{

typedef struct {

	_s390_regs_common32 regs;

	_s390_fp_regs32	    fpregs;

} _sigregs32;



typedef struct

{

typedef struct {

	__u32		gprs_high[__NUM_GPRS];

	__u64		vxrs_low[__NUM_VXRS_LOW];

	__vector128	vxrs_high[__NUM_VXRS_HIGH];
@@ -59,8 +55,7 @@ typedef struct 
#define __SIGNAL_FRAMESIZE32	96

#define _SIGMASK_COPY_SIZE32	(sizeof(u32) * 2)



struct sigcontext32

{

struct sigcontext32 {

	__u32	oldmask[_COMPAT_NSIG_WORDS];

	__u32	sregs;	/* pointer */

};
@@ -83,25 +78,6 @@ struct stat64_emu31; 
struct mmap_arg_struct_emu31;

struct fadvise64_64_args;



long compat_sys_s390_chown16(const char __user *filename, u16 user, u16 group);

long compat_sys_s390_lchown16(const char __user *filename, u16 user, u16 group);

long compat_sys_s390_fchown16(unsigned int fd, u16 user, u16 group);

long compat_sys_s390_setregid16(u16 rgid, u16 egid);

long compat_sys_s390_setgid16(u16 gid);

long compat_sys_s390_setreuid16(u16 ruid, u16 euid);

long compat_sys_s390_setuid16(u16 uid);

long compat_sys_s390_setresuid16(u16 ruid, u16 euid, u16 suid);

long compat_sys_s390_getresuid16(u16 __user *ruid, u16 __user *euid, u16 __user *suid);

long compat_sys_s390_setresgid16(u16 rgid, u16 egid, u16 sgid);

long compat_sys_s390_getresgid16(u16 __user *rgid, u16 __user *egid, u16 __user *sgid);

long compat_sys_s390_setfsuid16(u16 uid);

long compat_sys_s390_setfsgid16(u16 gid);

long compat_sys_s390_getgroups16(int gidsetsize, u16 __user *grouplist);

long compat_sys_s390_setgroups16(int gidsetsize, u16 __user *grouplist);

long compat_sys_s390_getuid16(void);

long compat_sys_s390_geteuid16(void);

long compat_sys_s390_getgid16(void);

long compat_sys_s390_getegid16(void);

long compat_sys_s390_truncate64(const char __user *path, u32 high, u32 low);

long compat_sys_s390_ftruncate64(unsigned int fd, u32 high, u32 low);

long compat_sys_s390_pread64(unsigned int fd, char __user *ubuf, compat_size_t count, u32 high, u32 low);