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:
f8abe86
)
x86: uaccess s/might_sleep/might_fault/
author
Michael S. Tsirkin
<
[email protected]
>
Sun, 26 May 2013 14:31:55 +0000
(17:31 +0300)
committer
Ingo Molnar
<
[email protected]
>
Tue, 28 May 2013 07:41:10 +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/x86/include/asm/uaccess_64.h
patch
|
blob
|
history
diff --git
a/arch/x86/include/asm/uaccess_64.h
b/arch/x86/include/asm/uaccess_64.h
index 142810c457dc5f91d90668480babd95d8a03f9b3..4f7923dd00079d0a582cb5467e05e43774001c44 100644
(file)
--- a/
arch/x86/include/asm/uaccess_64.h
+++ b/
arch/x86/include/asm/uaccess_64.h
@@
-235,7
+235,7
@@
extern long __copy_user_nocache(void *dst, const void __user *src,
static inline int
__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
{
- might_
sleep
();
+ might_
fault
();
return __copy_user_nocache(dst, src, size, 1);
}