From 9ac6c5a8273dd7133a79517c9cd47b1a66b51c24 Mon Sep 17 00:00:00 2001 From: hunt Date: Fri, 5 Oct 2007 20:15:45 +0000 Subject: 2007-10-05 Martin Hunt * aux_syscalls.stp: Put #ifdef CONFIG_COMPAT around compat code. --- tapset/ChangeLog | 3 +++ tapset/aux_syscalls.stp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 362d0996..3baca192 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,5 +1,8 @@ 2007-10-05 Martin Hunt + * aux_syscalls.stp: Put #ifdef CONFIG_COMPAT + around compat code. + * syscalls2.stp (rt_sigaction, sigaction): Call _struct_sigaction_u(). diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp index 117a60f8..3818ae75 100644 --- a/tapset/aux_syscalls.stp +++ b/tapset/aux_syscalls.stp @@ -115,6 +115,7 @@ function _struct_utimbuf_u:string(uaddr:long) function _struct_compat_utimbuf_u:string(uaddr:long) %{ /* pure */ +#ifdef CONFIG_COMPAT #include struct compat_utimbuf ubuf; static char abuf[24], mbuf[24]; @@ -130,6 +131,7 @@ function _struct_compat_utimbuf_u:string(uaddr:long) } else strlcpy (THIS->__retvalue, "UNKNOWN", MAXSTRINGLEN); } +#endif %} %{ @@ -169,6 +171,7 @@ function _struct_timespec_u:string(uaddr:long, n:long) %} function _struct_compat_timespec_u:string(uaddr:long, n:long) %{ /* pure */ +#ifdef CONFIG_COMPAT int n = (int)THIS->n; struct compat_timespec ts[n]; char *ptr = (char *)(unsigned long)THIS->uaddr; @@ -196,6 +199,7 @@ function _struct_compat_timespec_u:string(uaddr:long, n:long) } } } +#endif %} @@ -235,6 +239,7 @@ function _struct_itimerval_u:string(uaddr:long) function _struct_compat_itimerval_u:string(uaddr:long) %{ /* pure */ +#ifdef CONFIG_COMPAT struct compat_itimerval itv; char *ptr = (char *)(unsigned long)THIS->uaddr; @@ -248,6 +253,7 @@ function _struct_compat_itimerval_u:string(uaddr:long) (int)itv.it_interval.tv_sec, (int)itv.it_interval.tv_usec, (int)itv.it_value.tv_sec, (int)itv.it_value.tv_usec); } +#endif %} @@ -448,6 +454,7 @@ function __get_argv:string(a:long, first:long) /* This function copies an argv from userspace. */ function __get_compat_argv:string(a:long, first:long) %{ /* pure */ +#ifdef CONFIG_COMPAT compat_uptr_t __user *__user *argv = (compat_uptr_t __user *__user *)(long)THIS->a; compat_uptr_t __user *vstr; int space, rc, len = MAXSTRINGLEN; @@ -502,6 +509,7 @@ function __get_compat_argv:string(a:long, first:long) argv++; } *str = 0; +#endif %} /* -- cgit