aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-03-26 04:37:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 11:56:57 -0500
commit3158e9411a66fb98d495ac441c242264f31aaf3e (patch)
tree7b3bad47214c09c9dcd7ff27316c6de23f4c7cb0 /arch/ia64
parent88959ea968709c35e8b979ac9f5a398fa748091a (diff)
[PATCH] consolidate sys32/compat_adjtimex
Create compat_sys_adjtimex and use it an all appropriate places. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/ia32/sys_ia32.c62
1 files changed, 0 insertions, 62 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 1e1a2353aefd..5366b3b23d09 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -25,7 +25,6 @@
25#include <linux/resource.h> 25#include <linux/resource.h>
26#include <linux/times.h> 26#include <linux/times.h>
27#include <linux/utsname.h> 27#include <linux/utsname.h>
28#include <linux/timex.h>
29#include <linux/smp.h> 28#include <linux/smp.h>
30#include <linux/smp_lock.h> 29#include <linux/smp_lock.h>
31#include <linux/sem.h> 30#include <linux/sem.h>
@@ -2591,65 +2590,4 @@ sys32_setresgid(compat_gid_t rgid, compat_gid_t egid,
2591 ssgid = (sgid == (compat_gid_t)-1) ? ((gid_t)-1) : ((gid_t)sgid); 2590 ssgid = (sgid == (compat_gid_t)-1) ? ((gid_t)-1) : ((gid_t)sgid);
2592 return sys_setresgid(srgid, segid, ssgid); 2591 return sys_setresgid(srgid, segid, ssgid);
2593} 2592}
2594
2595/* Handle adjtimex compatibility. */
2596
2597extern int do_adjtimex(struct timex *);
2598
2599asmlinkage long
2600sys32_adjtimex(struct compat_timex *utp)
2601{
2602 struct timex txc;
2603 int ret;
2604
2605 memset(&txc, 0, sizeof(struct timex));
2606
2607 if(get_user(txc.modes, &utp->modes) ||
2608 __get_user(txc.offset, &utp->offset) ||
2609 __get_user(txc.freq, &utp->freq) ||
2610 __get_user(txc.maxerror, &utp->maxerror) ||
2611 __get_user(txc.esterror, &utp->esterror) ||
2612 __get_user(txc.status, &utp->status) ||
2613 __get_user(txc.constant, &utp->constant) ||
2614 __get_user(txc.precision, &utp->precision) ||
2615 __get_user(txc.tolerance, &utp->tolerance) ||
2616 __get_user(txc.time.tv_sec, &utp->time.tv_sec) ||
2617 __get_user(txc.time.tv_usec, &utp->time.tv_usec) ||
2618 __get_user(txc.tick, &utp->tick) ||
2619 __get_user(txc.ppsfreq, &utp->ppsfreq) ||
2620 __get_user(txc.jitter, &utp->jitter) ||
2621 __get_user(txc.shift, &utp->shift) ||
2622 __get_user(txc.stabil, &utp->stabil) ||
2623 __get_user(txc.jitcnt, &utp->jitcnt) ||
2624 __get_user(txc.calcnt, &utp->calcnt) ||
2625 __get_user(txc.errcnt, &utp->errcnt) ||
2626 __get_user(txc.stbcnt, &utp->stbcnt))
2627 return -EFAULT;
2628
2629 ret = do_adjtimex(&txc);
2630
2631 if(put_user(txc.modes, &utp->modes) ||
2632 __put_user(txc.offset, &utp->offset) ||
2633 __put_user(txc.freq, &utp->freq) ||
2634 __put_user(txc.maxerror, &utp->maxerror) ||
2635 __put_user(txc.esterror, &utp->esterror) ||
2636 __put_user(txc.status, &utp->status) ||
2637 __put_user(txc.constant, &utp->constant) ||
2638 __put_user(txc.precision, &utp->precision) ||
2639 __put_user(txc.tolerance, &utp->tolerance) ||
2640 __put_user(txc.time.tv_sec, &utp->time.tv_sec) ||
2641 __put_user(txc.time.tv_usec, &utp->time.tv_usec) ||
2642 __put_user(txc.tick, &utp->tick) ||
2643 __put_user(txc.ppsfreq, &utp->ppsfreq) ||
2644 __put_user(txc.jitter, &utp->jitter) ||
2645 __put_user(txc.shift, &utp->shift) ||
2646 __put_user(txc.stabil, &utp->stabil) ||
2647 __put_user(txc.jitcnt, &utp->jitcnt) ||
2648 __put_user(txc.calcnt, &utp->calcnt) ||
2649 __put_user(txc.errcnt, &utp->errcnt) ||
2650 __put_user(txc.stbcnt, &utp->stbcnt))
2651 ret = -EFAULT;
2652
2653 return ret;
2654}
2655#endif /* NOTYET */ 2593#endif /* NOTYET */