summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/uaccess.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-05 06:47:02 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-05 06:47:02 +0000
commit99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch)
tree3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /include/asm-sparc64/uaccess.h
parente73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff)
Merge with Linux 2.3.38.
Diffstat (limited to 'include/asm-sparc64/uaccess.h')
-rw-r--r--include/asm-sparc64/uaccess.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h
index e0dd2e4f3..72c2c6916 100644
--- a/include/asm-sparc64/uaccess.h
+++ b/include/asm-sparc64/uaccess.h
@@ -1,4 +1,4 @@
-/* $Id: uaccess.h,v 1.31 1999/07/30 09:31:24 davem Exp $ */
+/* $Id: uaccess.h,v 1.32 1999/11/23 08:56:48 davem Exp $ */
#ifndef _ASM_UACCESS_H
#define _ASM_UACCESS_H
@@ -347,8 +347,10 @@ extern int __strncpy_from_user(unsigned long dest, unsigned long src, int count)
__strncpy_from_user((unsigned long)(dest), (unsigned long)(src), (int)(count))
extern int __strlen_user(const char *);
+extern int __strnlen_user(const char *, long len);
#define strlen_user __strlen_user
+#define strnlen_user __strnlen_user
#endif /* __ASSEMBLY__ */