Only use compat functions/types when CONFIG_COMPAT defined.

* tapset/conversions.stp (user_long): Use #ifdef CONFIG_COMPAT.
  (user_long_warn): Likewise.

diff --git a/tapset/conversions.stp b/tapset/conversions.stp
index d50507c9f1572a11ef98c8be4f0d5d2dbed41413..c68d480e829a33bffc8245384a10730f139d354d 100644 (file)
--- a/tapset/conversions.stp
+++ b/tapset/conversions.stp
@@ -453,19 +453,23 @@ function user_long:long (addr:long) %{ /* pure */ /* unprivileged */
 
         assert_is_myproc();
 
+#ifdef CONFIG_COMPAT
        if (is_compat_task())
                l_size = sizeof(compat_long_t);
+#endif
 
        if (!access_ok(VERIFY_READ, (long *) (intptr_t) THIS->addr, l_size))
                goto fault;
        if (l_size == sizeof(long)) {
                if (__stp_get_user(THIS->__retvalue, (long *) (intptr_t) THIS->addr))
                goto fault;
+#ifdef CONFIG_COMPAT
        } else {
                if (__stp_get_user(THIS->__retvalue, (compat_long_t *) (intptr_t) THIS->addr)) {
 
                        goto fault;
                }
+#endif
        }
 
        if (0) {
@@ -492,8 +496,10 @@ function user_long_warn:long (addr:long) %{ /* pure */ /* unprivileged */
 
         assert_is_myproc();
 
+#ifdef CONFIG_COMPAT
        if (is_compat_task())
                l_size = sizeof(compat_long_t);
+#endif
 
        if (!access_ok(VERIFY_READ, (long *) (intptr_t) THIS->addr, l_size))
                goto fault;
@@ -501,11 +507,13 @@ function user_long_warn:long (addr:long) %{ /* pure */ /* unprivileged */
                if (__stp_get_user(THIS->__retvalue, (long *) (intptr_t) THIS->addr)) {
                        goto fault;
                }
+#ifdef CONFIG_COMPAT
        } else {
                if (__stp_get_user(THIS->__retvalue, (compat_long_t *) (intptr_t) THIS->addr)) {
 
                        goto fault;
                }
+#endif
        }
 
        if (0) {