]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - include/asm-sh/uaccess.h
lguest: net block unneeded receive queue update notifications
[linux-2.6-omap-h63xx.git] / include / asm-sh / uaccess.h
index f18a1a5c95c0ad4856685ab050d71a48b8cf5081..45c2c9b2993d7ad3b33720966e4a07ddb98d85c2 100644 (file)
-/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $
- *
- * User space memory access functions
- *
- * Copyright (C) 1999, 2002  Niibe Yutaka
- * Copyright (C) 2003  Paul Mundt
- *
- *  Based on:
- *     MIPS implementation version 1.15 by
- *              Copyright (C) 1996, 1997, 1998 by Ralf Baechle
- *     and i386 version.
- */
 #ifndef __ASM_SH_UACCESS_H
 #define __ASM_SH_UACCESS_H
 
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <asm/segment.h>
 
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
 
-/*
- * The fs value determines whether argument validity checking should be
- * performed or not.  If get_fs() == USER_DS, checking is performed, with
- * get_fs() == KERNEL_DS, checking is bypassed.
- *
- * For historical reasons (Data Segment Register?), these macros are misnamed.
- */
-
-#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
-
-#define KERNEL_DS      MAKE_MM_SEG(0xFFFFFFFFUL)
-#define USER_DS                MAKE_MM_SEG(PAGE_OFFSET)
-
-#define segment_eq(a,b)        ((a).seg == (b).seg)
-
-#define get_ds()       (KERNEL_DS)
-
-#if !defined(CONFIG_MMU)
-/* NOMMU is always true */
-#define __addr_ok(addr) (1)
-
-static inline mm_segment_t get_fs(void)
-{
-       return USER_DS;
-}
-
-static inline void set_fs(mm_segment_t s)
-{
-}
-
-/*
- * __access_ok: Check if address with size is OK or not.
- *
- * If we don't have an MMU (or if its disabled) the only thing we really have
- * to look out for is if the address resides somewhere outside of what
- * available RAM we have.
- *
- * TODO: This check could probably also stand to be restricted somewhat more..
- * though it still does the Right Thing(tm) for the time being.
- */
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-       return ((addr >= memory_start) && ((addr + size) < memory_end));
-}
-#else /* CONFIG_MMU */
 #define __addr_ok(addr) \
-       ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-
-#define get_fs()       (current_thread_info()->addr_limit)
-#define set_fs(x)      (current_thread_info()->addr_limit = (x))
+       ((unsigned long __force)(addr) < current_thread_info()->addr_limit.seg)
 
 /*
  * __access_ok: Check if address with size is OK or not.
  *
- * We do three checks:
- * (1) is it user space?
- * (2) addr + size --> carry?
- * (3) addr + size >= 0x80000000  (PAGE_OFFSET)
+ * Uhhuh, this needs 33-bit arithmetic. We have a carry..
  *
- * (1) (2) (3) | RESULT
- *  0   0   0  |  ok
- *  0   0   1  |  ok
- *  0   1   0  |  bad
- *  0   1   1  |  bad
- *  1   0   0  |  ok
- *  1   0   1  |  bad
- *  1   1   0  |  bad
- *  1   1   1  |  bad
+ * sum := addr + size;  carry? --> flag = true;
+ * if (sum >= addr_limit) flag = true;
  */
-static inline int __access_ok(unsigned long addr, unsigned long size)
-{
-       unsigned long flag, tmp;
-
-       __asm__("stc    r7_bank, %0\n\t"
-               "mov.l  @(8,%0), %0\n\t"
-               "clrt\n\t"
-               "addc   %2, %1\n\t"
-               "and    %1, %0\n\t"
-               "rotcl  %0\n\t"
-               "rotcl  %0\n\t"
-               "and    #3, %0"
-               : "=&z" (flag), "=r" (tmp)
-               : "r" (addr), "1" (size)
-               : "t");
-
-       return flag == 0;
-}
-#endif /* CONFIG_MMU */
-
-static inline int access_ok(int type, const void __user *p, unsigned long size)
-{
-       unsigned long addr = (unsigned long)p;
-       return __access_ok(addr, size);
-}
+#define __access_ok(addr, size)                \
+       (__addr_ok((addr) + (size)))
+#define access_ok(type, addr, size)    \
+       (__chk_user_ptr(addr),          \
+        __access_ok((unsigned long __force)(addr), (size)))
 
 /*
  * Uh, these should become the main single-value transfer routines ...
@@ -126,311 +37,71 @@ static inline int access_ok(int type, const void __user *p, unsigned long size)
  * (a) re-use the arguments for side effects (sizeof is ok)
  * (b) require any knowledge of processes at this stage
  */
-#define put_user(x,ptr)        __put_user_check((x),(ptr),sizeof(*(ptr)))
-#define get_user(x,ptr) __get_user_check((x),(ptr),sizeof(*(ptr)))
+#define put_user(x,ptr)                __put_user_check((x), (ptr), sizeof(*(ptr)))
+#define get_user(x,ptr)                __get_user_check((x), (ptr), sizeof(*(ptr)))
 
 /*
  * The "__xxx" versions do not do address space checking, useful when
  * doing multiple accesses to the same area (the user has to do the
  * checks by hand with "access_ok()")
  */
-#define __put_user(x,ptr) \
-  __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-#define __get_user(x,ptr) \
-  __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+#define __put_user(x,ptr)      __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
+#define __get_user(x,ptr)      __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
 
 struct __large_struct { unsigned long buf[100]; };
 #define __m(x) (*(struct __large_struct __user *)(x))
 
-#define __get_user_size(x,ptr,size,retval)                     \
-do {                                                           \
-       retval = 0;                                             \
-       __chk_user_ptr(ptr);                                    \
-       switch (size) {                                         \
-       case 1:                                                 \
-               __get_user_asm(x, ptr, retval, "b");            \
-               break;                                          \
-       case 2:                                                 \
-               __get_user_asm(x, ptr, retval, "w");            \
-               break;                                          \
-       case 4:                                                 \
-               __get_user_asm(x, ptr, retval, "l");            \
-               break;                                          \
-       default:                                                \
-               __get_user_unknown();                           \
-               break;                                          \
-       }                                                       \
-} while (0)
-
 #define __get_user_nocheck(x,ptr,size)                         \
 ({                                                             \
-       long __gu_err, __gu_val;                                \
-       __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
-       (x) = (__typeof__(*(ptr)))__gu_val;                     \
-       __gu_err;                                               \
-})
-
-#ifdef CONFIG_MMU
-#define __get_user_check(x,ptr,size)                           \
-({                                                             \
-       long __gu_err, __gu_val;                                \
+       long __gu_err;                                          \
+       unsigned long __gu_val;                                 \
+       const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
        __chk_user_ptr(ptr);                                    \
-       switch (size) {                                         \
-       case 1:                                                 \
-               __get_user_1(__gu_val, (ptr), __gu_err);        \
-               break;                                          \
-       case 2:                                                 \
-               __get_user_2(__gu_val, (ptr), __gu_err);        \
-               break;                                          \
-       case 4:                                                 \
-               __get_user_4(__gu_val, (ptr), __gu_err);        \
-               break;                                          \
-       default:                                                \
-               __get_user_unknown();                           \
-               break;                                          \
-       }                                                       \
-                                                               \
+       __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
        (x) = (__typeof__(*(ptr)))__gu_val;                     \
        __gu_err;                                               \
 })
 
-#define __get_user_1(x,addr,err) ({            \
-__asm__("stc   r7_bank, %1\n\t"                \
-       "mov.l  @(8,%1), %1\n\t"                \
-       "and    %2, %1\n\t"                     \
-       "cmp/pz %1\n\t"                         \
-       "bt/s   1f\n\t"                         \
-       " mov   #0, %0\n\t"                     \
-       "0:\n"                                  \
-       "mov    #-14, %0\n\t"                   \
-       "bra    2f\n\t"                         \
-       " mov   #0, %1\n"                       \
-       "1:\n\t"                                \
-       "mov.b  @%2, %1\n\t"                    \
-       "extu.b %1, %1\n"                       \
-       "2:\n"                                  \
-       ".section       __ex_table,\"a\"\n\t"   \
-       ".long  1b, 0b\n\t"                     \
-       ".previous"                             \
-       : "=&r" (err), "=&r" (x)                \
-       : "r" (addr)                            \
-       : "t");                                 \
-})
-
-#define __get_user_2(x,addr,err) ({            \
-__asm__("stc   r7_bank, %1\n\t"                \
-       "mov.l  @(8,%1), %1\n\t"                \
-       "and    %2, %1\n\t"                     \
-       "cmp/pz %1\n\t"                         \
-       "bt/s   1f\n\t"                         \
-       " mov   #0, %0\n\t"                     \
-       "0:\n"                                  \
-       "mov    #-14, %0\n\t"                   \
-       "bra    2f\n\t"                         \
-       " mov   #0, %1\n"                       \
-       "1:\n\t"                                \
-       "mov.w  @%2, %1\n\t"                    \
-       "extu.w %1, %1\n"                       \
-       "2:\n"                                  \
-       ".section       __ex_table,\"a\"\n\t"   \
-       ".long  1b, 0b\n\t"                     \
-       ".previous"                             \
-       : "=&r" (err), "=&r" (x)                \
-       : "r" (addr)                            \
-       : "t");                                 \
-})
-
-#define __get_user_4(x,addr,err) ({            \
-__asm__("stc   r7_bank, %1\n\t"                \
-       "mov.l  @(8,%1), %1\n\t"                \
-       "and    %2, %1\n\t"                     \
-       "cmp/pz %1\n\t"                         \
-       "bt/s   1f\n\t"                         \
-       " mov   #0, %0\n\t"                     \
-       "0:\n"                                  \
-       "mov    #-14, %0\n\t"                   \
-       "bra    2f\n\t"                         \
-       " mov   #0, %1\n"                       \
-       "1:\n\t"                                \
-       "mov.l  @%2, %1\n\t"                    \
-       "2:\n"                                  \
-       ".section       __ex_table,\"a\"\n\t"   \
-       ".long  1b, 0b\n\t"                     \
-       ".previous"                             \
-       : "=&r" (err), "=&r" (x)                \
-       : "r" (addr)                            \
-       : "t");                                 \
-})
-#else /* CONFIG_MMU */
 #define __get_user_check(x,ptr,size)                                   \
 ({                                                                     \
-       long __gu_err, __gu_val;                                        \
-       if (__access_ok((unsigned long)(ptr), (size))) {                \
-               __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
-               (x) = (__typeof__(*(ptr)))__gu_val;                     \
-       } else                                                          \
-               __gu_err = -EFAULT;                                     \
+       long __gu_err = -EFAULT;                                        \
+       unsigned long __gu_val = 0;                                     \
+       const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
+       if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
+               __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
+       (x) = (__typeof__(*(ptr)))__gu_val;                             \
        __gu_err;                                                       \
 })
-#endif
 
-#define __get_user_asm(x, addr, err, insn) \
-({ \
-__asm__ __volatile__( \
-       "1:\n\t" \
-       "mov." insn "   %2, %1\n\t" \
-       "mov    #0, %0\n" \
-       "2:\n" \
-       ".section       .fixup,\"ax\"\n" \
-       "3:\n\t" \
-       "mov    #0, %1\n\t" \
-       "mov.l  4f, %0\n\t" \
-       "jmp    @%0\n\t" \
-       " mov   %3, %0\n" \
-       "4:     .long   2b\n\t" \
-       ".previous\n" \
-       ".section       __ex_table,\"a\"\n\t" \
-       ".long  1b, 3b\n\t" \
-       ".previous" \
-       :"=&r" (err), "=&r" (x) \
-       :"m" (__m(addr)), "i" (-EFAULT)); })
-
-extern void __get_user_unknown(void);
-
-#define __put_user_size(x,ptr,size,retval)             \
-do {                                                   \
-       retval = 0;                                     \
-       __chk_user_ptr(ptr);                            \
-       switch (size) {                                 \
-       case 1:                                         \
-               __put_user_asm(x, ptr, retval, "b");    \
-               break;                                  \
-       case 2:                                         \
-               __put_user_asm(x, ptr, retval, "w");    \
-               break;                                  \
-       case 4:                                         \
-               __put_user_asm(x, ptr, retval, "l");    \
-               break;                                  \
-       case 8:                                         \
-               __put_user_u64(x, ptr, retval);         \
-               break;                                  \
-       default:                                        \
-               __put_user_unknown();                   \
-       }                                               \
-} while (0)
-
-#define __put_user_nocheck(x,ptr,size)                 \
-({                                                     \
-       long __pu_err;                                  \
-       __put_user_size((x),(ptr),(size),__pu_err);     \
-       __pu_err;                                       \
+#define __put_user_nocheck(x,ptr,size)                         \
+({                                                             \
+       long __pu_err;                                          \
+       __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
+       __chk_user_ptr(ptr);                                    \
+       __put_user_size((x), __pu_addr, (size), __pu_err);      \
+       __pu_err;                                               \
 })
 
 #define __put_user_check(x,ptr,size)                           \
 ({                                                             \
        long __pu_err = -EFAULT;                                \
        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
-                                                               \
-       if (__access_ok((unsigned long)__pu_addr,size))         \
-               __put_user_size((x),__pu_addr,(size),__pu_err); \
+       if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))   \
+               __put_user_size((x), __pu_addr, (size),         \
+                               __pu_err);                      \
        __pu_err;                                               \
 })
 
-#define __put_user_asm(x, addr, err, insn) \
-({ \
-__asm__ __volatile__( \
-       "1:\n\t" \
-       "mov." insn "   %1, %2\n\t" \
-       "mov    #0, %0\n" \
-       "2:\n" \
-       ".section       .fixup,\"ax\"\n" \
-       "3:\n\t" \
-       "nop\n\t" \
-       "mov.l  4f, %0\n\t" \
-       "jmp    @%0\n\t" \
-       "mov    %3, %0\n" \
-       "4:     .long   2b\n\t" \
-       ".previous\n" \
-       ".section       __ex_table,\"a\"\n\t" \
-       ".long  1b, 3b\n\t" \
-       ".previous" \
-       :"=&r" (err) \
-       :"r" (x), "m" (__m(addr)), "i" (-EFAULT) \
-        :"memory"); })
-
-#if defined(__LITTLE_ENDIAN__)
-#define __put_user_u64(val,addr,retval) \
-({ \
-__asm__ __volatile__( \
-       "1:\n\t" \
-       "mov.l  %R1,%2\n\t" \
-       "mov.l  %S1,%T2\n\t" \
-       "mov    #0,%0\n" \
-       "2:\n" \
-       ".section       .fixup,\"ax\"\n" \
-       "3:\n\t" \
-       "nop\n\t" \
-       "mov.l  4f,%0\n\t" \
-       "jmp    @%0\n\t" \
-       " mov   %3,%0\n" \
-       "4:     .long   2b\n\t" \
-       ".previous\n" \
-       ".section       __ex_table,\"a\"\n\t" \
-       ".long  1b, 3b\n\t" \
-       ".previous" \
-       : "=r" (retval) \
-       : "r" (val), "m" (__m(addr)), "i" (-EFAULT) \
-        : "memory"); })
+#ifdef CONFIG_SUPERH32
+# include "uaccess_32.h"
 #else
-#define __put_user_u64(val,addr,retval) \
-({ \
-__asm__ __volatile__( \
-       "1:\n\t" \
-       "mov.l  %S1,%2\n\t" \
-       "mov.l  %R1,%T2\n\t" \
-       "mov    #0,%0\n" \
-       "2:\n" \
-       ".section       .fixup,\"ax\"\n" \
-       "3:\n\t" \
-       "nop\n\t" \
-       "mov.l  4f,%0\n\t" \
-       "jmp    @%0\n\t" \
-       " mov   %3,%0\n" \
-       "4:     .long   2b\n\t" \
-       ".previous\n" \
-       ".section       __ex_table,\"a\"\n\t" \
-       ".long  1b, 3b\n\t" \
-       ".previous" \
-       : "=r" (retval) \
-       : "r" (val), "m" (__m(addr)), "i" (-EFAULT) \
-        : "memory"); })
+# include "uaccess_64.h"
 #endif
 
-extern void __put_user_unknown(void);
-
 /* Generic arbitrary sized copy.  */
 /* Return the number of bytes NOT copied */
 __kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n);
 
-#define copy_to_user(to,from,n) ({ \
-void *__copy_to = (void *) (to); \
-__kernel_size_t __copy_size = (__kernel_size_t) (n); \
-__kernel_size_t __copy_res; \
-if(__copy_size && __access_ok((unsigned long)__copy_to, __copy_size)) { \
-__copy_res = __copy_user(__copy_to, (void *) (from), __copy_size); \
-} else __copy_res = __copy_size; \
-__copy_res; })
-
-#define copy_from_user(to,from,n) ({ \
-void *__copy_to = (void *) (to); \
-void *__copy_from = (void *) (from); \
-__kernel_size_t __copy_size = (__kernel_size_t) (n); \
-__kernel_size_t __copy_res; \
-if(__copy_size && __access_ok((unsigned long)__copy_from, __copy_size)) { \
-__copy_res = __copy_user(__copy_to, __copy_from, __copy_size); \
-} else __copy_res = __copy_size; \
-__copy_res; })
-
 static __always_inline unsigned long
 __copy_from_user(void *to, const void __user *from, unsigned long n)
 {
@@ -450,99 +121,89 @@ __copy_to_user(void __user *to, const void *from, unsigned long n)
  * Clear the area and return remaining number of bytes
  * (on failure.  Usually it's 0.)
  */
-extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
+__kernel_size_t __clear_user(void *addr, __kernel_size_t size);
 
-#define clear_user(addr,n) ({ \
-void * __cl_addr = (addr); \
-unsigned long __cl_size = (n); \
-if (__cl_size && __access_ok(((unsigned long)(__cl_addr)), __cl_size)) \
-__cl_size = __clear_user(__cl_addr, __cl_size); \
-__cl_size; })
+#define clear_user(addr,n)                                             \
+({                                                                     \
+       void __user * __cl_addr = (addr);                               \
+       unsigned long __cl_size = (n);                                  \
+                                                                       \
+       if (__cl_size && access_ok(VERIFY_WRITE,                        \
+               ((unsigned long)(__cl_addr)), __cl_size))               \
+               __cl_size = __clear_user(__cl_addr, __cl_size);         \
+                                                                       \
+       __cl_size;                                                      \
+})
+
+/**
+ * strncpy_from_user: - Copy a NUL terminated string from userspace.
+ * @dst:   Destination address, in kernel space.  This buffer must be at
+ *         least @count bytes long.
+ * @src:   Source address, in user space.
+ * @count: Maximum number of bytes to copy, including the trailing NUL.
+ *
+ * Copies a NUL-terminated string from userspace to kernel space.
+ *
+ * On success, returns the length of the string (not including the trailing
+ * NUL).
+ *
+ * If access to userspace fails, returns -EFAULT (some data may have been
+ * copied).
+ *
+ * If @count is smaller than the length of the string, copies @count bytes
+ * and returns @count.
+ */
+#define strncpy_from_user(dest,src,count)                              \
+({                                                                     \
+       unsigned long __sfu_src = (unsigned long)(src);                 \
+       int __sfu_count = (int)(count);                                 \
+       long __sfu_res = -EFAULT;                                       \
+                                                                       \
+       if (__access_ok(__sfu_src, __sfu_count))                        \
+               __sfu_res = __strncpy_from_user((unsigned long)(dest),  \
+                               __sfu_src, __sfu_count);                \
+                                                                       \
+       __sfu_res;                                                      \
+})
 
-static __inline__ int
-__strncpy_from_user(unsigned long __dest, unsigned long __user __src, int __count)
+static inline unsigned long
+copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-       __kernel_size_t res;
-       unsigned long __dummy, _d, _s;
-
-       __asm__ __volatile__(
-               "9:\n"
-               "mov.b  @%2+, %1\n\t"
-               "cmp/eq #0, %1\n\t"
-               "bt/s   2f\n"
-               "1:\n"
-               "mov.b  %1, @%3\n\t"
-               "dt     %7\n\t"
-               "bf/s   9b\n\t"
-               " add   #1, %3\n\t"
-               "2:\n\t"
-               "sub    %7, %0\n"
-               "3:\n"
-               ".section .fixup,\"ax\"\n"
-               "4:\n\t"
-               "mov.l  5f, %1\n\t"
-               "jmp    @%1\n\t"
-               " mov   %8, %0\n\t"
-               ".balign 4\n"
-               "5:     .long 3b\n"
-               ".previous\n"
-               ".section __ex_table,\"a\"\n"
-               "       .balign 4\n"
-               "       .long 9b,4b\n"
-               ".previous"
-               : "=r" (res), "=&z" (__dummy), "=r" (_s), "=r" (_d)
-               : "0" (__count), "2" (__src), "3" (__dest), "r" (__count),
-                 "i" (-EFAULT)
-               : "memory", "t");
-
-       return res;
-}
+       unsigned long __copy_from = (unsigned long) from;
+       __kernel_size_t __copy_size = (__kernel_size_t) n;
 
-#define strncpy_from_user(dest,src,count) ({ \
-unsigned long __sfu_src = (unsigned long) (src); \
-int __sfu_count = (int) (count); \
-long __sfu_res = -EFAULT; \
-if(__access_ok(__sfu_src, __sfu_count)) { \
-__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count); \
-} __sfu_res; })
+       if (__copy_size && __access_ok(__copy_from, __copy_size))
+               return __copy_user(to, from, __copy_size);
 
-/*
- * Return the size of a string (including the ending 0!)
- */
-static __inline__ long __strnlen_user(const char __user *__s, long __n)
+       return __copy_size;
+}
+
+static inline unsigned long
+copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-       unsigned long res;
-       unsigned long __dummy;
-
-       __asm__ __volatile__(
-               "9:\n"
-               "cmp/eq %4, %0\n\t"
-               "bt     2f\n"
-               "1:\t"
-               "mov.b  @(%0,%3), %1\n\t"
-               "tst    %1, %1\n\t"
-               "bf/s   9b\n\t"
-               " add   #1, %0\n"
-               "2:\n"
-               ".section .fixup,\"ax\"\n"
-               "3:\n\t"
-               "mov.l  4f, %1\n\t"
-               "jmp    @%1\n\t"
-               " mov   #0, %0\n"
-               ".balign 4\n"
-               "4:     .long 2b\n"
-               ".previous\n"
-               ".section __ex_table,\"a\"\n"
-               "       .balign 4\n"
-               "       .long 1b,3b\n"
-               ".previous"
-               : "=z" (res), "=&r" (__dummy)
-               : "0" (0), "r" (__s), "r" (__n)
-               : "t");
-       return res;
+       unsigned long __copy_to = (unsigned long) to;
+       __kernel_size_t __copy_size = (__kernel_size_t) n;
+
+       if (__copy_size && __access_ok(__copy_to, __copy_size))
+               return __copy_user(to, from, __copy_size);
+
+       return __copy_size;
 }
 
-static __inline__ long strnlen_user(const char __user *s, long n)
+/**
+ * strnlen_user: - Get the size of a string in user space.
+ * @s: The string to measure.
+ * @n: The maximum valid length
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * Get the size of a NUL-terminated string in user space.
+ *
+ * Returns the size of the string INCLUDING the terminating NUL.
+ * On exception, returns 0.
+ * If the string is too long, returns a value greater than @n.
+ */
+static inline long strnlen_user(const char __user *s, long n)
 {
        if (!__addr_ok(s))
                return 0;
@@ -550,6 +211,20 @@ static __inline__ long strnlen_user(const char __user *s, long n)
                return __strnlen_user(s, n);
 }
 
+/**
+ * strlen_user: - Get the size of a string in user space.
+ * @str: The string to measure.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * Get the size of a NUL-terminated string in user space.
+ *
+ * Returns the size of the string INCLUDING the terminating NUL.
+ * On exception, returns 0.
+ *
+ * If there is a limit on the length of a valid string, you may wish to
+ * consider using strnlen_user() instead.
+ */
 #define strlen_user(str)       strnlen_user(str, ~0UL >> 1)
 
 /*
@@ -564,12 +239,18 @@ static __inline__ long strnlen_user(const char __user *s, long n)
  * we don't even have to jump over them.  Further, they do not intrude
  * on our cache or tlb entries.
  */
-
-struct exception_table_entry
-{
+struct exception_table_entry {
        unsigned long insn, fixup;
 };
 
-extern int fixup_exception(struct pt_regs *regs);
+#if defined(CONFIG_SUPERH64) && defined(CONFIG_MMU)
+#define ARCH_HAS_SEARCH_EXTABLE
+#endif
+
+int fixup_exception(struct pt_regs *regs);
+/* Returns 0 if exception not found and fixup.unit otherwise.  */
+unsigned long search_exception_table(unsigned long addr);
+const struct exception_table_entry *search_exception_tables(unsigned long addr);
+
 
 #endif /* __ASM_SH_UACCESS_H */