git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
uaccess.h
diff --git
a/arch/blackfin/include/asm/uaccess.h
b/arch/blackfin/include/asm/uaccess.h
index
1c0d190
..
5cc1115
100644
(file)
--- a/
arch/blackfin/include/asm/uaccess.h
+++ b/
arch/blackfin/include/asm/uaccess.h
@@
-195,17
+195,17
@@
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))
copy_from_user(void *to, const void __user *from, unsigned long n)
{
if (access_ok(VERIFY_READ, from, n))
- memcpy(to, from, n);
+ memcpy(to,
(const void __force *)
from, n);
else
return n;
return 0;
}
static inline unsigned long __must_check
else
return n;
return 0;
}
static inline unsigned long __must_check
-copy_to_user(void
*to, const void __user
*from, unsigned long n)
+copy_to_user(void
__user *to, const void
*from, unsigned long n)
{
if (access_ok(VERIFY_WRITE, to, n))
{
if (access_ok(VERIFY_WRITE, to, n))
- memcpy(to, from, n);
+ memcpy(
(void __force *)
to, from, n);
else
return n;
return 0;
else
return n;
return 0;