lkml.org 
[lkml]   [2012]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/11] x86, uaccess: Merge prototypes for clear_user/__clear_user
    Date
    From: "H. Peter Anvin" <hpa@linux.intel.com>

    The prototypes for clear_user() and __clear_user() are identical in
    the 32- and 64-bit headers. No functionality change.

    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    arch/x86/include/asm/uaccess.h | 3 +++
    arch/x86/include/asm/uaccess_32.h | 3 ---
    arch/x86/include/asm/uaccess_64.h | 3 ---
    3 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
    index e1f3a17..2c7df3d 100644
    --- a/arch/x86/include/asm/uaccess.h
    +++ b/arch/x86/include/asm/uaccess.h
    @@ -569,6 +569,9 @@ strncpy_from_user(char *dst, const char __user *src, long count);
    extern __must_check long strlen_user(const char __user *str);
    extern __must_check long strnlen_user(const char __user *str, long n);

    +unsigned long __must_check clear_user(void __user *mem, unsigned long len);
    +unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
    +
    /*
    * movsl can be slow when source and dest are not both 8-byte aligned
    */
    diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
    index 576e39b..7f760a9 100644
    --- a/arch/x86/include/asm/uaccess_32.h
    +++ b/arch/x86/include/asm/uaccess_32.h
    @@ -213,7 +213,4 @@ static inline unsigned long __must_check copy_from_user(void *to,
    return n;
    }

    -unsigned long __must_check clear_user(void __user *mem, unsigned long len);
    -unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
    -
    #endif /* _ASM_X86_UACCESS_32_H */
    diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
    index d8def8b..142810c 100644
    --- a/arch/x86/include/asm/uaccess_64.h
    +++ b/arch/x86/include/asm/uaccess_64.h
    @@ -217,9 +217,6 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
    }
    }

    -__must_check unsigned long clear_user(void __user *mem, unsigned long len);
    -__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
    -
    static __must_check __always_inline int
    __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
    {
    --
    1.7.6.5


    \
     
     \ /
      Last update: 2012-09-21 22:01    [W:4.222 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site