linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Wed, 17 Aug 2005 18:57:40 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/08/17 18:57:34

Modified files:
        include/asm-mips: uaccess.h 

Log message:
        Drop might_sleep() calls from get_user() & co.  This should fix the 
issue
        in 
http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=200508171321.20094.Joshua.Wise%40sicortex.com
 and it's the right thing to do anyway because
        it was inflating those functions way too much.

diff -urN linux/include/asm-mips/uaccess.h linux/include/asm-mips/uaccess.h
--- linux/include/asm-mips/uaccess.h    2005/07/14 12:05:09     1.47
+++ linux/include/asm-mips/uaccess.h    2005/08/17 17:57:34     1.48
@@ -237,7 +237,6 @@
        __typeof(*(ptr)) __gu_val =  (__typeof(*(ptr))) 0;              \
        long __gu_err = 0;                                              \
                                                                        \
-       might_sleep();                                                  \
        switch (size) {                                                 \
        case 1: __get_user_asm("lb", ptr); break;                       \
        case 2: __get_user_asm("lh", ptr); break;                       \
@@ -255,8 +254,6 @@
        __typeof__(*(ptr)) __gu_val = 0;                                \
        long __gu_err = -EFAULT;                                        \
                                                                        \
-       might_sleep();                                                  \
-                                                                       \
        if (likely(access_ok(VERIFY_READ,  __gu_addr, size))) {         \
                switch (size) {                                         \
                case 1: __get_user_asm("lb", __gu_addr); break;         \
@@ -326,7 +323,6 @@
        __typeof__(*(ptr)) __pu_val;                                    \
        long __pu_err = 0;                                              \
                                                                        \
-       might_sleep();                                                  \
        __pu_val = (x);                                                 \
        switch (size) {                                                 \
        case 1: __put_user_asm("sb", ptr); break;                       \
@@ -344,8 +340,6 @@
        __typeof__(*(ptr)) __pu_val = (x);                              \
        long __pu_err = -EFAULT;                                        \
                                                                        \
-       might_sleep();                                                  \
-                                                                       \
        if (likely(access_ok(VERIFY_WRITE,  __pu_addr, size))) {        \
                switch (size) {                                         \
                case 1: __put_user_asm("sb", __pu_addr); break;         \

<Prev in Thread] Current Thread [Next in Thread>