Skip to content

Commit

Permalink
microblaze: Simple __copy_tofrom_user for noMMU
Browse files Browse the repository at this point in the history
This is first patch which clear part of uaccess.h.
uaccess.h will be clear later.

Signed-off-by: John Williams <john.williams@petalogix.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
John Williams authored and Michal Simek committed Dec 14, 2009
1 parent fd6ed51 commit 95dfbbe
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/microblaze/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,9 @@ static inline int clear_user(char *to, int size)
return size;
}

extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
#define __copy_from_user(to, from, n) copy_from_user((to), (from), (n))
#define __copy_from_user_inatomic(to, from, n) \
copy_from_user((to), (from), (n))

#define copy_to_user(to, from, n) \
(access_ok(VERIFY_WRITE, (to), (n)) ? \
Expand All @@ -290,10 +291,6 @@ extern unsigned long __copy_tofrom_user(void __user *to,
(void __user *)(from), (n)) \
: -EFAULT)

#define __copy_from_user(to, from, n) copy_from_user((to), (from), (n))
#define __copy_from_user_inatomic(to, from, n) \
copy_from_user((to), (from), (n))

extern int __strncpy_user(char *to, const char __user *from, int len);
extern int __strnlen_user(const char __user *sstr, int len);

Expand All @@ -305,6 +302,9 @@ extern int __strnlen_user(const char __user *sstr, int len);

#endif /* CONFIG_MMU */

extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);

/*
* The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is
Expand Down
7 changes: 7 additions & 0 deletions arch/microblaze/lib/uaccess.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,10 @@ long strncpy_from_user(char *dst, const char __user *src, long count)
__do_strncpy_from_user(dst, src, count, res);
return res;
}

unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size)
{
memcpy(to, from, size);
return 0;
}

0 comments on commit 95dfbbe

Please sign in to comment.