Commit 3158e941 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] consolidate sys32/compat_adjtimex 



Create compat_sys_adjtimex and use it an all appropriate places.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
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 88959ea9

arch/alpha/kernel/osf_sys.c

+0 −1
Original line number Diff line number Diff line
@@ -821,7 +821,6 @@ osf_setsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes, 
   affects all sorts of things, like timeval and itimerval.  */



extern struct timezone sys_tz;

extern int do_adjtimex(struct timex *);



struct timeval32

{

arch/ia64/ia32/sys_ia32.c

+0 −62
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/resource.h>

#include <linux/times.h>

#include <linux/utsname.h>

#include <linux/timex.h>

#include <linux/smp.h>

#include <linux/smp_lock.h>

#include <linux/sem.h>
@@ -2591,65 +2590,4 @@ sys32_setresgid(compat_gid_t rgid, compat_gid_t egid, 
	ssgid = (sgid == (compat_gid_t)-1) ? ((gid_t)-1) : ((gid_t)sgid);

	return sys_setresgid(srgid, segid, ssgid);

}



/* Handle adjtimex compatibility. */



extern int do_adjtimex(struct timex *);



asmlinkage long

sys32_adjtimex(struct compat_timex *utp)

{

	struct timex txc;

	int ret;



	memset(&txc, 0, sizeof(struct timex));



	if(get_user(txc.modes, &utp->modes) ||

	   __get_user(txc.offset, &utp->offset) ||

	   __get_user(txc.freq, &utp->freq) ||

	   __get_user(txc.maxerror, &utp->maxerror) ||

	   __get_user(txc.esterror, &utp->esterror) ||

	   __get_user(txc.status, &utp->status) ||

	   __get_user(txc.constant, &utp->constant) ||

	   __get_user(txc.precision, &utp->precision) ||

	   __get_user(txc.tolerance, &utp->tolerance) ||

	   __get_user(txc.time.tv_sec, &utp->time.tv_sec) ||

	   __get_user(txc.time.tv_usec, &utp->time.tv_usec) ||

	   __get_user(txc.tick, &utp->tick) ||

	   __get_user(txc.ppsfreq, &utp->ppsfreq) ||

	   __get_user(txc.jitter, &utp->jitter) ||

	   __get_user(txc.shift, &utp->shift) ||

	   __get_user(txc.stabil, &utp->stabil) ||

	   __get_user(txc.jitcnt, &utp->jitcnt) ||

	   __get_user(txc.calcnt, &utp->calcnt) ||

	   __get_user(txc.errcnt, &utp->errcnt) ||

	   __get_user(txc.stbcnt, &utp->stbcnt))

		return -EFAULT;



	ret = do_adjtimex(&txc);



	if(put_user(txc.modes, &utp->modes) ||

	   __put_user(txc.offset, &utp->offset) ||

	   __put_user(txc.freq, &utp->freq) ||

	   __put_user(txc.maxerror, &utp->maxerror) ||

	   __put_user(txc.esterror, &utp->esterror) ||

	   __put_user(txc.status, &utp->status) ||

	   __put_user(txc.constant, &utp->constant) ||

	   __put_user(txc.precision, &utp->precision) ||

	   __put_user(txc.tolerance, &utp->tolerance) ||

	   __put_user(txc.time.tv_sec, &utp->time.tv_sec) ||

	   __put_user(txc.time.tv_usec, &utp->time.tv_usec) ||

	   __put_user(txc.tick, &utp->tick) ||

	   __put_user(txc.ppsfreq, &utp->ppsfreq) ||

	   __put_user(txc.jitter, &utp->jitter) ||

	   __put_user(txc.shift, &utp->shift) ||

	   __put_user(txc.stabil, &utp->stabil) ||

	   __put_user(txc.jitcnt, &utp->jitcnt) ||

	   __put_user(txc.calcnt, &utp->calcnt) ||

	   __put_user(txc.errcnt, &utp->errcnt) ||

	   __put_user(txc.stbcnt, &utp->stbcnt))

		ret = -EFAULT;



	return ret;

}

#endif /* NOTYET */

arch/mips/kernel/linux32.c

+0 −61
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/utime.h>

#include <linux/utsname.h>

#include <linux/personality.h>

#include <linux/timex.h>

#include <linux/dnotify.h>

#include <linux/module.h>

#include <linux/binfmts.h>
@@ -1157,66 +1156,6 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32) 
	return err;

}



/* Handle adjtimex compatibility. */



extern int do_adjtimex(struct timex *);



asmlinkage int sys32_adjtimex(struct compat_timex __user *utp)

{

	struct timex txc;

	int ret;



	memset(&txc, 0, sizeof(struct timex));



	if (get_user(txc.modes, &utp->modes) ||

	   __get_user(txc.offset, &utp->offset) ||

	   __get_user(txc.freq, &utp->freq) ||

	   __get_user(txc.maxerror, &utp->maxerror) ||

	   __get_user(txc.esterror, &utp->esterror) ||

	   __get_user(txc.status, &utp->status) ||

	   __get_user(txc.constant, &utp->constant) ||

	   __get_user(txc.precision, &utp->precision) ||

	   __get_user(txc.tolerance, &utp->tolerance) ||

	   __get_user(txc.time.tv_sec, &utp->time.tv_sec) ||

	   __get_user(txc.time.tv_usec, &utp->time.tv_usec) ||

	   __get_user(txc.tick, &utp->tick) ||

	   __get_user(txc.ppsfreq, &utp->ppsfreq) ||

	   __get_user(txc.jitter, &utp->jitter) ||

	   __get_user(txc.shift, &utp->shift) ||

	   __get_user(txc.stabil, &utp->stabil) ||

	   __get_user(txc.jitcnt, &utp->jitcnt) ||

	   __get_user(txc.calcnt, &utp->calcnt) ||

	   __get_user(txc.errcnt, &utp->errcnt) ||

	   __get_user(txc.stbcnt, &utp->stbcnt))

		return -EFAULT;



	ret = do_adjtimex(&txc);



	if (put_user(txc.modes, &utp->modes) ||

	   __put_user(txc.offset, &utp->offset) ||

	   __put_user(txc.freq, &utp->freq) ||

	   __put_user(txc.maxerror, &utp->maxerror) ||

	   __put_user(txc.esterror, &utp->esterror) ||

	   __put_user(txc.status, &utp->status) ||

	   __put_user(txc.constant, &utp->constant) ||

	   __put_user(txc.precision, &utp->precision) ||

	   __put_user(txc.tolerance, &utp->tolerance) ||

	   __put_user(txc.time.tv_sec, &utp->time.tv_sec) ||

	   __put_user(txc.time.tv_usec, &utp->time.tv_usec) ||

	   __put_user(txc.tick, &utp->tick) ||

	   __put_user(txc.ppsfreq, &utp->ppsfreq) ||

	   __put_user(txc.jitter, &utp->jitter) ||

	   __put_user(txc.shift, &utp->shift) ||

	   __put_user(txc.stabil, &utp->stabil) ||

	   __put_user(txc.jitcnt, &utp->jitcnt) ||

	   __put_user(txc.calcnt, &utp->calcnt) ||

	   __put_user(txc.errcnt, &utp->errcnt) ||

	   __put_user(txc.stbcnt, &utp->stbcnt))

		ret = -EFAULT;



	return ret;

}



asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset,

	s32 count)

{

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ EXPORT(sysn32_call_table) 
	PTR	sys_pivot_root

	PTR	sys32_sysctl

	PTR	sys_prctl

	PTR	sys32_adjtimex

	PTR	compat_sys_adjtimex

	PTR	compat_sys_setrlimit		/* 6155 */

	PTR	sys_chroot

	PTR	sys_sync

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ sys_call_table: 
	PTR	sys_setdomainname

	PTR	sys32_newuname

	PTR	sys_ni_syscall			/* sys_modify_ldt */

	PTR	sys32_adjtimex

	PTR	compat_sys_adjtimex

	PTR	sys_mprotect			/* 4125 */

	PTR	compat_sys_sigprocmask

	PTR	sys_ni_syscall			/* was creat_module */