From 7373613ed16cfead2820b3c9b265d7ee2b6a5f12 Mon Sep 17 00:00:00 2001 From: Vadim Lobanov Date: Fri, 14 Jul 2006 00:24:01 -0700 Subject: [PATCH] --- yaml --- r: 32622 b: refs/heads/master c: 8477b55ba11a49515b26573a90414b718179c908 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/lib/usercopy.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2cddfd5e9eb5..a44acbe1ece1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78a887a5942d06c81ccf0793fbf2bd83e982122 +refs/heads/master: 8477b55ba11a49515b26573a90414b718179c908 diff --git a/trunk/arch/i386/lib/usercopy.c b/trunk/arch/i386/lib/usercopy.c index 4b75212ab6dd..efc7e7d5f4d0 100644 --- a/trunk/arch/i386/lib/usercopy.c +++ b/trunk/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);