summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2007-09-25 16:52:08 +0000
committerhunt <hunt>2007-09-25 16:52:08 +0000
commit3ea1a7133d6f1afc84d5b85fdb36f7dae029eef6 (patch)
tree994997143b9d556a58d3239a4552adcea7d105ee
parent2fcfa2929fd33f846947f48a805c0ef1bd828d29 (diff)
downloadsystemtap-steved-3ea1a7133d6f1afc84d5b85fdb36f7dae029eef6.tar.gz
systemtap-steved-3ea1a7133d6f1afc84d5b85fdb36f7dae029eef6.tar.xz
systemtap-steved-3ea1a7133d6f1afc84d5b85fdb36f7dae029eef6.zip
2007-09-25 Martin Hunt <hunt@redhat.com>
* aux_syscalls.stp (_struct_compat_timeval_u): ifdef CONFIG_COMPAT so buildok test will pass.
-rw-r--r--tapset/ChangeLog5
-rw-r--r--tapset/aux_syscalls.stp4
2 files changed, 8 insertions, 1 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 4608019c..fcb1090d 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-25 Martin Hunt <hunt@redhat.com>
+
+ * aux_syscalls.stp (_struct_compat_timeval_u): ifdef
+ CONFIG_COMPAT so buildok test will pass.
+
2007-09-25 Zhaolei <zhaolei@cn.fujitsu.com>
From Cai Fei <caifei@cn.fujitsu.com>
diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp
index 4c9df863..94444d7a 100644
--- a/tapset/aux_syscalls.stp
+++ b/tapset/aux_syscalls.stp
@@ -24,6 +24,7 @@ function _struct_timeval_u:string(uaddr:long, n:long)
function _struct_compat_timeval_u:string(uaddr:long, n:long)
%{ /* pure */
+#ifdef CONFIG_COMPAT
int n = (int)THIS->n;
struct compat_timeval tv[n];
char *ptr = (char *)(unsigned long)THIS->uaddr;
@@ -31,7 +32,7 @@ function _struct_compat_timeval_u:string(uaddr:long, n:long)
if (ptr == NULL || n > 2)
strlcpy (THIS->__retvalue, "NULL", MAXSTRINGLEN);
else {
- if(_stp_copy_from_user((char*)&tv, ptr, n*sizeof(struct compat_timeval)) == 0)
+ if(_stp_copy_from_user((char*)&tv, ptr, n*sizeof(struct compat_timeval)) == 0)
if (n == 2)
snprintf(THIS->__retvalue, MAXSTRINGLEN, "[%ld.%06ld][%ld.%.06ld]",
(long)tv[0].tv_sec, (long)tv[0].tv_usec, (long)tv[1].tv_sec, (long)tv[1].tv_usec);
@@ -40,6 +41,7 @@ function _struct_compat_timeval_u:string(uaddr:long, n:long)
else
strlcpy (THIS->__retvalue, "UNKNOWN", MAXSTRINGLEN);
}
+#endif
%}