---

yaml --- r: 346853 b: refs/heads/master c: 2a7e077 h: refs/heads/master i: 346851: dcc676e v: v3
git-mirror · Dec 13, 2012 · de1cbbc · de1cbbc
1 parent a8b5247
commit de1cbbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10dc42b5b262f3bb2e4532759e4e1147ebf6a22f
+refs/heads/master: 2a7e0775d0b0dfc083f97c72dc885f6dab8dd27b
diff --git a/trunk/arch/blackfin/include/asm/uaccess.h b/trunk/arch/blackfin/include/asm/uaccess.h
@@ -237,18 +237,18 @@ strncpy_from_user(char *dst, const char __user *src, long count)
  * On exception, returns 0.
  * If the string is too long, returns a value greater than n.
  */
-static inline long __must_check strnlen_user(const char *src, long n)
+static inline long __must_check strnlen_user(const char __user *src, long n)
 {
 	if (!access_ok(VERIFY_READ, src, 1))
 		return 0;
-	return strnlen(src, n) + 1;
+	return strnlen((const char __force *)src, n) + 1;
 }
 
-static inline long __must_check strlen_user(const char *src)
+static inline long __must_check strlen_user(const char __user *src)
 {
 	if (!access_ok(VERIFY_READ, src, 1))
 		return 0;
-	return strlen(src) + 1;
+	return strlen((const char __force *)src) + 1;
 }
 
 /*