projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
56d2ef7
)
frv: uaccess s/might_sleep/might_fault/
author
Michael S. Tsirkin
<
[email protected]
>
Sun, 26 May 2013 14:30:47 +0000
(17:30 +0300)
committer
Ingo Molnar
<
[email protected]
>
Tue, 28 May 2013 07:41:07 +0000
(09:41 +0200)
The only reason uaccess routines might sleep
is if they fault. Make this explicit.
Signed-off-by: Michael S. Tsirkin <
[email protected]
>
Signed-off-by: Peter Zijlstra <
[email protected]
>
Cc: Linus Torvalds <
[email protected]
>
Cc: Andrew Morton <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/frv/include/asm/uaccess.h
patch
|
blob
|
history
diff --git
a/arch/frv/include/asm/uaccess.h
b/arch/frv/include/asm/uaccess.h
index 0b67ec5b44141ff5216184380355554197ba2107..3ac9a59d65d4129142d06ba9516455e0c5dc96db 100644
(file)
--- a/
arch/frv/include/asm/uaccess.h
+++ b/
arch/frv/include/asm/uaccess.h
@@
-280,14
+280,14
@@
extern long __memcpy_user(void *dst, const void *src, unsigned long count);
static inline unsigned long __must_check
__copy_to_user(void __user *to, const void *from, unsigned long n)
{
- might_
sleep
();
+ might_
fault
();
return __copy_to_user_inatomic(to, from, n);
}
static inline unsigned long
__copy_from_user(void *to, const void __user *from, unsigned long n)
{
- might_
sleep
();
+ might_
fault
();
return __copy_from_user_inatomic(to, from, n);
}