[PATCH] remove spurious might_sleep in i386 usercopy

From: Zwane Mwaikambo
Date: Fri Sep 24 2004 - 08:12:00 EST


There seem to be multiple might_sleep() statements littered about in
arch/i386/lib/usercopy.c as the primitives (__do_clear_user,
__copy_to_user, __copy_from_user) already do the might_sleep() check.

Signed-off-by: Zwane Mwaikambo <zwane@xxxxxxxxxxx>

Index: linux-2.6.9-rc2-mm1/arch/i386/lib/usercopy.c
===================================================================
RCS file: /home/cvsroot/linux-2.6.9-rc2-mm1/arch/i386/lib/usercopy.c,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 usercopy.c
--- linux-2.6.9-rc2-mm1/arch/i386/lib/usercopy.c 16 Sep 2004 13:41:16 -0000 1.1.1.1
+++ linux-2.6.9-rc2-mm1/arch/i386/lib/usercopy.c 24 Sep 2004 01:26:13 -0000
@@ -152,7 +152,6 @@ do { \
unsigned long
clear_user(void __user *to, unsigned long n)
{
- might_sleep();
if (access_ok(VERIFY_WRITE, to, n))
__do_clear_user(to, n);
return n;
@@ -596,7 +595,6 @@ __copy_from_user_ll(void *to, const void
unsigned long
copy_to_user(void __user *to, const void *from, unsigned long n)
{
- might_sleep();
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
@@ -622,7 +620,6 @@ EXPORT_SYMBOL(copy_to_user);
unsigned long
copy_from_user(void *to, const void __user *from, unsigned long n)
{
- might_sleep();
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/