Commit 88959ea9 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] create struct compat_timex and use it everywhere 



We had a copy of the compatibility version of struct timex in each 64 bit
architecture.  This patch just creates a global one and replaces all the
usages of the old ones.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: default avatarKyle McMartin <kyle@parisc-linux.org>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eb76b3fd

arch/ia64/ia32/sys_ia32.c

+1 −14
Original line number Diff line number Diff line
@@ -2594,23 +2594,10 @@ sys32_setresgid(compat_gid_t rgid, compat_gid_t egid, 


/* Handle adjtimex compatibility. */



struct timex32 {

	u32 modes;

	s32 offset, freq, maxerror, esterror;

	s32 status, constant, precision, tolerance;

	struct compat_timeval time;

	s32 tick;

	s32 ppsfreq, jitter, shift, stabil;

	s32 jitcnt, calcnt, errcnt, stbcnt;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

};



extern int do_adjtimex(struct timex *);



asmlinkage long

sys32_adjtimex(struct timex32 *utp)

sys32_adjtimex(struct compat_timex *utp)

{

	struct timex txc;

	int ret;

arch/mips/kernel/linux32.c

+1 −14
Original line number Diff line number Diff line
@@ -1159,22 +1159,9 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32) 


/* Handle adjtimex compatibility. */



struct timex32 {

	u32 modes;

	s32 offset, freq, maxerror, esterror;

	s32 status, constant, precision, tolerance;

	struct compat_timeval time;

	s32 tick;

	s32 ppsfreq, jitter, shift, stabil;

	s32 jitcnt, calcnt, errcnt, stbcnt;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

};



extern int do_adjtimex(struct timex *);



asmlinkage int sys32_adjtimex(struct timex32 __user *utp)

asmlinkage int sys32_adjtimex(struct compat_timex __user *utp)

{

	struct timex txc;

	int ret;

arch/parisc/kernel/sys_parisc32.c

+4 −33
Original line number Diff line number Diff line
@@ -567,43 +567,14 @@ asmlinkage int sys32_sendfile64(int out_fd, int in_fd, compat_loff_t __user *off 
}





struct timex32 {

	unsigned int modes;	/* mode selector */

	int offset;		/* time offset (usec) */

	int freq;		/* frequency offset (scaled ppm) */

	int maxerror;		/* maximum error (usec) */

	int esterror;		/* estimated error (usec) */

	int status;		/* clock command/status */

	int constant;		/* pll time constant */

	int precision;		/* clock precision (usec) (read only) */

	int tolerance;		/* clock frequency tolerance (ppm)

				 * (read only)

				 */

	struct compat_timeval time;	/* (read only) */

	int tick;		/* (modified) usecs between clock ticks */



	int ppsfreq;           /* pps frequency (scaled ppm) (ro) */

	int jitter;            /* pps jitter (us) (ro) */

	int shift;              /* interval duration (s) (shift) (ro) */

	int stabil;            /* pps stability (scaled ppm) (ro) */

	int jitcnt;            /* jitter limit exceeded (ro) */

	int calcnt;            /* calibration intervals (ro) */

	int errcnt;            /* calibration errors (ro) */

	int stbcnt;            /* stability limit exceeded (ro) */



	int  :32; int  :32; int  :32; int  :32;

	int  :32; int  :32; int  :32; int  :32;

	int  :32; int  :32; int  :32; int  :32;

};



asmlinkage long sys32_adjtimex(struct timex32 __user *txc_p32)

asmlinkage long sys32_adjtimex(struct compat_timex __user *txc_p32)

{

	struct timex txc;

	struct timex32 t32;

	struct compat_timex t32;

	int ret;

	extern int do_adjtimex(struct timex *txc);



	if(copy_from_user(&t32, txc_p32, sizeof(struct timex32)))

	if(copy_from_user(&t32, txc_p32, sizeof(struct compat_timex)))

		return -EFAULT;

#undef CP

#define CP(x) txc.x = t32.x
@@ -620,7 +591,7 @@ asmlinkage long sys32_adjtimex(struct timex32 __user *txc_p32) 
	CP(time.tv_sec); CP(time.tv_usec); CP(tick); CP(ppsfreq); CP(jitter);

	CP(shift); CP(stabil); CP(jitcnt); CP(calcnt); CP(errcnt);

	CP(stbcnt);

	return copy_to_user(txc_p32, &t32, sizeof(struct timex32)) ? -EFAULT : ret;

	return copy_to_user(txc_p32, &t32, sizeof(struct compat_timex)) ? -EFAULT : ret;

}

arch/powerpc/kernel/sys_ppc32.c

+1 −14
Original line number Diff line number Diff line
@@ -162,22 +162,9 @@ asmlinkage long compat_sys_sysfs(u32 option, u32 arg1, u32 arg2) 
}



/* Handle adjtimex compatibility. */

struct timex32 {

	u32 modes;

	s32 offset, freq, maxerror, esterror;

	s32 status, constant, precision, tolerance;

	struct compat_timeval time;

	s32 tick;

	s32 ppsfreq, jitter, shift, stabil;

	s32 jitcnt, calcnt, errcnt, stbcnt;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

};



extern int do_adjtimex(struct timex *);



asmlinkage long compat_sys_adjtimex(struct timex32 __user *utp)

asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp)

{

	struct timex txc;

	int ret;

arch/s390/kernel/compat_linux.c

+1 −14
Original line number Diff line number Diff line
@@ -707,22 +707,9 @@ asmlinkage long sys32_sendfile64(int out_fd, int in_fd, 


/* Handle adjtimex compatibility. */



struct timex32 {

	u32 modes;

	s32 offset, freq, maxerror, esterror;

	s32 status, constant, precision, tolerance;

	struct compat_timeval time;

	s32 tick;

	s32 ppsfreq, jitter, shift, stabil;

	s32 jitcnt, calcnt, errcnt, stbcnt;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

	s32  :32; s32  :32; s32  :32; s32  :32;

};



extern int do_adjtimex(struct timex *);



asmlinkage long sys32_adjtimex(struct timex32 __user *utp)

asmlinkage long sys32_adjtimex(struct compat_timex __user *utp)

{

	struct timex txc;

	int ret;