From: Vadim Lobanov Date: Fri, 14 Jul 2006 07:24:01 +0000 (-0700) Subject: [PATCH] i386: remove redundant might_sleep() in user accessors. X-Git-Tag: v2.6.18-rc2~64 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=8477b55ba11a49515b26573a90414b718179c908;p=safe%2Fjmp%2Flinux-2.6 [PATCH] i386: remove redundant might_sleep() in user accessors. On i386, the user space accessor functions copy_from/to_user() both invoke might_sleep(), do a quick sanity check, and then pass the work on to their __copy_from/to_user() counterparts, which again invoke might_sleep(). Given that no actual work happens between these two calls, it is best to eliminate one of the redundant might_sleep()s. Signed-off-by: Vadim Lobanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c index 4b75212..efc7e7d 100644 --- a/arch/i386/lib/usercopy.c +++ b/arch/i386/lib/usercopy.c @@ -843,7 +843,6 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) { - might_sleep(); BUG_ON((long) n < 0); if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); @@ -870,7 +869,6 @@ EXPORT_SYMBOL(copy_to_user); unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) { - might_sleep(); BUG_ON((long) n < 0); if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n);