lkml.org 
[lkml]   [2008]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 34/39] Be more explicit in __put_user_x
    Date
    For both __put_user_x and __put_user_8 macros, pass the error
    variable explicitly.

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    include/asm-x86/uaccess_32.h | 14 +++++++-------
    1 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h
    index ebfe6b2..2c90673 100644
    --- a/include/asm-x86/uaccess_32.h
    +++ b/include/asm-x86/uaccess_32.h
    @@ -31,11 +31,11 @@ extern void __put_user_2(void);
    extern void __put_user_4(void);
    extern void __put_user_8(void);

    -#define __put_user_x(size, x, ptr) \
    +#define __put_user_x(size, x, ptr, __ret_pu) \
    asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
    :"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")

    -#define __put_user_8(x, ptr) \
    +#define __put_user_8(x, ptr, __ret_pu) \
    asm volatile("call __put_user_8" : "=a" (__ret_pu) \
    : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")

    @@ -66,19 +66,19 @@ extern void __put_user_8(void);
    __pu_val = x; \
    switch (sizeof(*(ptr))) { \
    case 1: \
    - __put_user_x(1, __pu_val, ptr); \
    + __put_user_x(1, __pu_val, ptr, __ret_pu); \
    break; \
    case 2: \
    - __put_user_x(2, __pu_val, ptr); \
    + __put_user_x(2, __pu_val, ptr, __ret_pu); \
    break; \
    case 4: \
    - __put_user_x(4, __pu_val, ptr); \
    + __put_user_x(4, __pu_val, ptr, __ret_pu); \
    break; \
    case 8: \
    - __put_user_8(__pu_val, ptr); \
    + __put_user_8(__pu_val, ptr, __ret_pu); \
    break; \
    default: \
    - __put_user_x(X, __pu_val, ptr); \
    + __put_user_x(X, __pu_val, ptr, __ret_pu); \
    break; \
    } \
    __ret_pu; \
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-06-27 23:55    [W:0.023 / U:61.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site