lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 034/110] metag/usercopy: Drop unused macros
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: James Hogan <james.hogan@imgtec.com>

    commit ef62a2d81f73d9cddef14bc3d9097a57010d551c upstream.

    Metag's lib/usercopy.c has a bunch of copy_from_user macros for larger
    copies between 5 and 16 bytes which are completely unused. Before fixing
    zeroing lets drop these macros so there is less to fix.

    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: linux-metag@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/metag/lib/usercopy.c | 113 ----------------------------------------------
    1 file changed, 113 deletions(-)

    --- a/arch/metag/lib/usercopy.c
    +++ b/arch/metag/lib/usercopy.c
    @@ -651,119 +651,6 @@ EXPORT_SYMBOL(__copy_user);
    #define __asm_copy_from_user_4(to, from, ret) \
    __asm_copy_from_user_4x_cont(to, from, ret, "", "", "")

    -#define __asm_copy_from_user_5(to, from, ret) \
    - __asm_copy_from_user_4x_cont(to, from, ret, \
    - " GETB D1Ar1,[%1++]\n" \
    - "4: SETB [%0++],D1Ar1\n", \
    - "5: ADD %2,%2,#1\n" \
    - " SETB [%0++],D1Ar1\n", \
    - " .long 4b,5b\n")
    -
    -#define __asm_copy_from_user_6x_cont(to, from, ret, COPY, FIXUP, TENTRY) \
    - __asm_copy_from_user_4x_cont(to, from, ret, \
    - " GETW D1Ar1,[%1++]\n" \
    - "4: SETW [%0++],D1Ar1\n" COPY, \
    - "5: ADD %2,%2,#2\n" \
    - " SETW [%0++],D1Ar1\n" FIXUP, \
    - " .long 4b,5b\n" TENTRY)
    -
    -#define __asm_copy_from_user_6(to, from, ret) \
    - __asm_copy_from_user_6x_cont(to, from, ret, "", "", "")
    -
    -#define __asm_copy_from_user_7(to, from, ret) \
    - __asm_copy_from_user_6x_cont(to, from, ret, \
    - " GETB D1Ar1,[%1++]\n" \
    - "6: SETB [%0++],D1Ar1\n", \
    - "7: ADD %2,%2,#1\n" \
    - " SETB [%0++],D1Ar1\n", \
    - " .long 6b,7b\n")
    -
    -#define __asm_copy_from_user_8x_cont(to, from, ret, COPY, FIXUP, TENTRY) \
    - __asm_copy_from_user_4x_cont(to, from, ret, \
    - " GETD D1Ar1,[%1++]\n" \
    - "4: SETD [%0++],D1Ar1\n" COPY, \
    - "5: ADD %2,%2,#4\n" \
    - " SETD [%0++],D1Ar1\n" FIXUP, \
    - " .long 4b,5b\n" TENTRY)
    -
    -#define __asm_copy_from_user_8(to, from, ret) \
    - __asm_copy_from_user_8x_cont(to, from, ret, "", "", "")
    -
    -#define __asm_copy_from_user_9(to, from, ret) \
    - __asm_copy_from_user_8x_cont(to, from, ret, \
    - " GETB D1Ar1,[%1++]\n" \
    - "6: SETB [%0++],D1Ar1\n", \
    - "7: ADD %2,%2,#1\n" \
    - " SETB [%0++],D1Ar1\n", \
    - " .long 6b,7b\n")
    -
    -#define __asm_copy_from_user_10x_cont(to, from, ret, COPY, FIXUP, TENTRY) \
    - __asm_copy_from_user_8x_cont(to, from, ret, \
    - " GETW D1Ar1,[%1++]\n" \
    - "6: SETW [%0++],D1Ar1\n" COPY, \
    - "7: ADD %2,%2,#2\n" \
    - " SETW [%0++],D1Ar1\n" FIXUP, \
    - " .long 6b,7b\n" TENTRY)
    -
    -#define __asm_copy_from_user_10(to, from, ret) \
    - __asm_copy_from_user_10x_cont(to, from, ret, "", "", "")
    -
    -#define __asm_copy_from_user_11(to, from, ret) \
    - __asm_copy_from_user_10x_cont(to, from, ret, \
    - " GETB D1Ar1,[%1++]\n" \
    - "8: SETB [%0++],D1Ar1\n", \
    - "9: ADD %2,%2,#1\n" \
    - " SETB [%0++],D1Ar1\n", \
    - " .long 8b,9b\n")
    -
    -#define __asm_copy_from_user_12x_cont(to, from, ret, COPY, FIXUP, TENTRY) \
    - __asm_copy_from_user_8x_cont(to, from, ret, \
    - " GETD D1Ar1,[%1++]\n" \
    - "6: SETD [%0++],D1Ar1\n" COPY, \
    - "7: ADD %2,%2,#4\n" \
    - " SETD [%0++],D1Ar1\n" FIXUP, \
    - " .long 6b,7b\n" TENTRY)
    -
    -#define __asm_copy_from_user_12(to, from, ret) \
    - __asm_copy_from_user_12x_cont(to, from, ret, "", "", "")
    -
    -#define __asm_copy_from_user_13(to, from, ret) \
    - __asm_copy_from_user_12x_cont(to, from, ret, \
    - " GETB D1Ar1,[%1++]\n" \
    - "8: SETB [%0++],D1Ar1\n", \
    - "9: ADD %2,%2,#1\n" \
    - " SETB [%0++],D1Ar1\n", \
    - " .long 8b,9b\n")
    -
    -#define __asm_copy_from_user_14x_cont(to, from, ret, COPY, FIXUP, TENTRY) \
    - __asm_copy_from_user_12x_cont(to, from, ret, \
    - " GETW D1Ar1,[%1++]\n" \
    - "8: SETW [%0++],D1Ar1\n" COPY, \
    - "9: ADD %2,%2,#2\n" \
    - " SETW [%0++],D1Ar1\n" FIXUP, \
    - " .long 8b,9b\n" TENTRY)
    -
    -#define __asm_copy_from_user_14(to, from, ret) \
    - __asm_copy_from_user_14x_cont(to, from, ret, "", "", "")
    -
    -#define __asm_copy_from_user_15(to, from, ret) \
    - __asm_copy_from_user_14x_cont(to, from, ret, \
    - " GETB D1Ar1,[%1++]\n" \
    - "10: SETB [%0++],D1Ar1\n", \
    - "11: ADD %2,%2,#1\n" \
    - " SETB [%0++],D1Ar1\n", \
    - " .long 10b,11b\n")
    -
    -#define __asm_copy_from_user_16x_cont(to, from, ret, COPY, FIXUP, TENTRY) \
    - __asm_copy_from_user_12x_cont(to, from, ret, \
    - " GETD D1Ar1,[%1++]\n" \
    - "8: SETD [%0++],D1Ar1\n" COPY, \
    - "9: ADD %2,%2,#4\n" \
    - " SETD [%0++],D1Ar1\n" FIXUP, \
    - " .long 8b,9b\n" TENTRY)
    -
    -#define __asm_copy_from_user_16(to, from, ret) \
    - __asm_copy_from_user_16x_cont(to, from, ret, "", "", "")

    #define __asm_copy_from_user_8x64(to, from, ret) \
    asm volatile ( \

    \
     
     \ /
      Last update: 2017-04-10 19:15    [W:6.428 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site