diff options
author | James Hogan <james.hogan@imgtec.com> | 2017-03-31 05:37:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-12 06:41:12 -0400 |
commit | 2bb52b47e7f420bbed4192efca20a9de8ff4fa08 (patch) | |
tree | 0c4030177bf9b411ff0cc95d9f669fb452eb2877 /arch/metag | |
parent | 9afc076d281208464039eafdd99d6c53e7862236 (diff) |
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/metag')
-rw-r--r-- | arch/metag/lib/usercopy.c | 113 |
1 files changed, 0 insertions, 113 deletions
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); | |||
651 | #define __asm_copy_from_user_4(to, from, ret) \ | 651 | #define __asm_copy_from_user_4(to, from, ret) \ |
652 | __asm_copy_from_user_4x_cont(to, from, ret, "", "", "") | 652 | __asm_copy_from_user_4x_cont(to, from, ret, "", "", "") |
653 | 653 | ||
654 | #define __asm_copy_from_user_5(to, from, ret) \ | ||
655 | __asm_copy_from_user_4x_cont(to, from, ret, \ | ||
656 | " GETB D1Ar1,[%1++]\n" \ | ||
657 | "4: SETB [%0++],D1Ar1\n", \ | ||
658 | "5: ADD %2,%2,#1\n" \ | ||
659 | " SETB [%0++],D1Ar1\n", \ | ||
660 | " .long 4b,5b\n") | ||
661 | |||
662 | #define __asm_copy_from_user_6x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
663 | __asm_copy_from_user_4x_cont(to, from, ret, \ | ||
664 | " GETW D1Ar1,[%1++]\n" \ | ||
665 | "4: SETW [%0++],D1Ar1\n" COPY, \ | ||
666 | "5: ADD %2,%2,#2\n" \ | ||
667 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
668 | " .long 4b,5b\n" TENTRY) | ||
669 | |||
670 | #define __asm_copy_from_user_6(to, from, ret) \ | ||
671 | __asm_copy_from_user_6x_cont(to, from, ret, "", "", "") | ||
672 | |||
673 | #define __asm_copy_from_user_7(to, from, ret) \ | ||
674 | __asm_copy_from_user_6x_cont(to, from, ret, \ | ||
675 | " GETB D1Ar1,[%1++]\n" \ | ||
676 | "6: SETB [%0++],D1Ar1\n", \ | ||
677 | "7: ADD %2,%2,#1\n" \ | ||
678 | " SETB [%0++],D1Ar1\n", \ | ||
679 | " .long 6b,7b\n") | ||
680 | |||
681 | #define __asm_copy_from_user_8x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
682 | __asm_copy_from_user_4x_cont(to, from, ret, \ | ||
683 | " GETD D1Ar1,[%1++]\n" \ | ||
684 | "4: SETD [%0++],D1Ar1\n" COPY, \ | ||
685 | "5: ADD %2,%2,#4\n" \ | ||
686 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
687 | " .long 4b,5b\n" TENTRY) | ||
688 | |||
689 | #define __asm_copy_from_user_8(to, from, ret) \ | ||
690 | __asm_copy_from_user_8x_cont(to, from, ret, "", "", "") | ||
691 | |||
692 | #define __asm_copy_from_user_9(to, from, ret) \ | ||
693 | __asm_copy_from_user_8x_cont(to, from, ret, \ | ||
694 | " GETB D1Ar1,[%1++]\n" \ | ||
695 | "6: SETB [%0++],D1Ar1\n", \ | ||
696 | "7: ADD %2,%2,#1\n" \ | ||
697 | " SETB [%0++],D1Ar1\n", \ | ||
698 | " .long 6b,7b\n") | ||
699 | |||
700 | #define __asm_copy_from_user_10x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
701 | __asm_copy_from_user_8x_cont(to, from, ret, \ | ||
702 | " GETW D1Ar1,[%1++]\n" \ | ||
703 | "6: SETW [%0++],D1Ar1\n" COPY, \ | ||
704 | "7: ADD %2,%2,#2\n" \ | ||
705 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
706 | " .long 6b,7b\n" TENTRY) | ||
707 | |||
708 | #define __asm_copy_from_user_10(to, from, ret) \ | ||
709 | __asm_copy_from_user_10x_cont(to, from, ret, "", "", "") | ||
710 | |||
711 | #define __asm_copy_from_user_11(to, from, ret) \ | ||
712 | __asm_copy_from_user_10x_cont(to, from, ret, \ | ||
713 | " GETB D1Ar1,[%1++]\n" \ | ||
714 | "8: SETB [%0++],D1Ar1\n", \ | ||
715 | "9: ADD %2,%2,#1\n" \ | ||
716 | " SETB [%0++],D1Ar1\n", \ | ||
717 | " .long 8b,9b\n") | ||
718 | |||
719 | #define __asm_copy_from_user_12x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
720 | __asm_copy_from_user_8x_cont(to, from, ret, \ | ||
721 | " GETD D1Ar1,[%1++]\n" \ | ||
722 | "6: SETD [%0++],D1Ar1\n" COPY, \ | ||
723 | "7: ADD %2,%2,#4\n" \ | ||
724 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
725 | " .long 6b,7b\n" TENTRY) | ||
726 | |||
727 | #define __asm_copy_from_user_12(to, from, ret) \ | ||
728 | __asm_copy_from_user_12x_cont(to, from, ret, "", "", "") | ||
729 | |||
730 | #define __asm_copy_from_user_13(to, from, ret) \ | ||
731 | __asm_copy_from_user_12x_cont(to, from, ret, \ | ||
732 | " GETB D1Ar1,[%1++]\n" \ | ||
733 | "8: SETB [%0++],D1Ar1\n", \ | ||
734 | "9: ADD %2,%2,#1\n" \ | ||
735 | " SETB [%0++],D1Ar1\n", \ | ||
736 | " .long 8b,9b\n") | ||
737 | |||
738 | #define __asm_copy_from_user_14x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
739 | __asm_copy_from_user_12x_cont(to, from, ret, \ | ||
740 | " GETW D1Ar1,[%1++]\n" \ | ||
741 | "8: SETW [%0++],D1Ar1\n" COPY, \ | ||
742 | "9: ADD %2,%2,#2\n" \ | ||
743 | " SETW [%0++],D1Ar1\n" FIXUP, \ | ||
744 | " .long 8b,9b\n" TENTRY) | ||
745 | |||
746 | #define __asm_copy_from_user_14(to, from, ret) \ | ||
747 | __asm_copy_from_user_14x_cont(to, from, ret, "", "", "") | ||
748 | |||
749 | #define __asm_copy_from_user_15(to, from, ret) \ | ||
750 | __asm_copy_from_user_14x_cont(to, from, ret, \ | ||
751 | " GETB D1Ar1,[%1++]\n" \ | ||
752 | "10: SETB [%0++],D1Ar1\n", \ | ||
753 | "11: ADD %2,%2,#1\n" \ | ||
754 | " SETB [%0++],D1Ar1\n", \ | ||
755 | " .long 10b,11b\n") | ||
756 | |||
757 | #define __asm_copy_from_user_16x_cont(to, from, ret, COPY, FIXUP, TENTRY) \ | ||
758 | __asm_copy_from_user_12x_cont(to, from, ret, \ | ||
759 | " GETD D1Ar1,[%1++]\n" \ | ||
760 | "8: SETD [%0++],D1Ar1\n" COPY, \ | ||
761 | "9: ADD %2,%2,#4\n" \ | ||
762 | " SETD [%0++],D1Ar1\n" FIXUP, \ | ||
763 | " .long 8b,9b\n" TENTRY) | ||
764 | |||
765 | #define __asm_copy_from_user_16(to, from, ret) \ | ||
766 | __asm_copy_from_user_16x_cont(to, from, ret, "", "", "") | ||
767 | 654 | ||
768 | #define __asm_copy_from_user_8x64(to, from, ret) \ | 655 | #define __asm_copy_from_user_8x64(to, from, ret) \ |
769 | asm volatile ( \ | 656 | asm volatile ( \ |