summaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-06-23 11:04:03 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 16:42:54 +0200
commita8a77573c9e5345bcf6a963858745cd83c923f44 (patch)
tree04f9bc72aca54effdb2254dd1e0b8ec5fa94f6cf /arch/frv
parent[PATCH] SELinux: add security_task_movememory calls to mm code (diff)
downloadlinux-a8a77573c9e5345bcf6a963858745cd83c923f44.tar.xz
linux-a8a77573c9e5345bcf6a963858745cd83c923f44.zip
[PATCH] frv: __user infrastructure
Add general annotations to the FRV arch for sparse. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/uaccess.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/frv/kernel/uaccess.c b/arch/frv/kernel/uaccess.c
index 9b751c0f0e84..9fb771a20df3 100644
--- a/arch/frv/kernel/uaccess.c
+++ b/arch/frv/kernel/uaccess.c
@@ -17,7 +17,7 @@
/*
* copy a null terminated string from userspace
*/
-long strncpy_from_user(char *dst, const char *src, long count)
+long strncpy_from_user(char *dst, const char __user *src, long count)
{
unsigned long max;
char *p, ch;
@@ -70,9 +70,9 @@ EXPORT_SYMBOL(strncpy_from_user);
*
* Return 0 on exception, a value greater than N if too long
*/
-long strnlen_user(const char *src, long count)
+long strnlen_user(const char __user *src, long count)
{
- const char *p;
+ const char __user *p;
long err = 0;
char ch;