Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 127112
b: refs/heads/master
c: 75aca61
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and Bryan Wu committed Jan 7, 2009
1 parent 9b936c0 commit 562f18d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d41e8009994f429ef7198a750c37fd9660366fab
refs/heads/master: 75aca61b1fc76f46da79d1a4ec393faa19005927
15 changes: 8 additions & 7 deletions trunk/arch/blackfin/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ static inline int bad_user_access_length(void)
#define copy_from_user_ret(to,from,n,retval) ({ if (copy_from_user(to,from,n))\
return retval; })

static inline long copy_from_user(void *to,
const void __user * from, unsigned long n)
static inline unsigned long __must_check
copy_from_user(void *to, const void __user *from, unsigned long n)
{
if (access_ok(VERIFY_READ, from, n))
memcpy(to, from, n);
Expand All @@ -207,8 +207,8 @@ static inline long copy_from_user(void *to,
return 0;
}

static inline long copy_to_user(void *to,
const void __user * from, unsigned long n)
static inline unsigned long __must_check
copy_to_user(void *to, const void __user *from, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
memcpy(to, from, n);
Expand All @@ -221,8 +221,8 @@ static inline long copy_to_user(void *to,
* Copy a null terminated string from userspace.
*/

static inline long strncpy_from_user(char *dst,
const char *src, long count)
static inline long __must_check
strncpy_from_user(char *dst, const char *src, long count)
{
char *tmp;
if (!access_ok(VERIFY_READ, src, 1))
Expand All @@ -248,7 +248,8 @@ static inline long strnlen_user(const char *src, long n)
* Zero Userspace
*/

static inline unsigned long __clear_user(void *to, unsigned long n)
static inline unsigned long __must_check
__clear_user(void *to, unsigned long n)
{
memset(to, 0, n);
return 0;
Expand Down

0 comments on commit 562f18d

Please sign in to comment.