x86: uaccess s/might_sleep/might_fault/

mstsirkin · Ingo Molnar · commit 016be2e55d98 · 2013-05-28T09:41:10.000+02:00
The only reason uaccess routines might sleep is if they fault. Make this explicit. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1369577426-26721-9-git-send-email-mst@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ extern long __copy_user_nocache(void dst, const void __user src,`
`235`	`235`	`static inline int`
`236`	`236`	`__copy_from_user_nocache(void dst, const void __user src, unsigned size)`
`237`	`237`	`{`
`238`		`- might_sleep();`
	`238`	`+ might_fault();`
`239`	`239`	`return __copy_user_nocache(dst, src, size, 1);`
`240`	`240`	`}`
`241`	`241`