| From c54b8fe7f26ee6602fb78485e9283edbd9addc99 Mon Sep 17 00:00:00 2001 |
| From: James Hogan <james.hogan@imgtec.com> |
| Date: Fri, 31 Mar 2017 10:37:44 +0100 |
| Subject: [PATCH] metag/usercopy: Drop unused macros |
| |
| 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 |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c |
| index b3ebfe9c8e88..b4eb1f17069f 100644 |
| --- 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 ( \ |
| -- |
| 2.12.0 |
| |
