MIPS: Remove get_fs/set_fs

[linux-2.6-microblaze.git] / arch / mips / lib / strncpy_user.S

diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S
index acdff66..556acf6 100644 (file)
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
@@ -29,19 +29,17 @@
  * it happens at most some bytes of the exceptions handlers will be copied.
  */
 
-       .macro __BUILD_STRNCPY_ASM func
-LEAF(__strncpy_from_\func\()_asm)
-       LONG_L          v0, TI_ADDR_LIMIT($28)  # pointer ok?
-       and             v0, a1
-       bnez            v0, .Lfault\@
-
+LEAF(__strncpy_from_user_asm)
        move            t0, zero
        move            v1, a1
-.ifeqs "\func","kernel"
-1:     EX(lbu, v0, (v1), .Lfault\@)
-.else
-1:     EX(lbue, v0, (v1), .Lfault\@)
-.endif
+#ifdef CONFIG_EVA
+       .set push
+       .set eva
+1:     EX(lbue, v0, (v1), .Lfault)
+       .set pop
+#else
+1:     EX(lbu, v0, (v1), .Lfault)
+#endif
        PTR_ADDIU       v1, 1
        R10KCBARRIER(0(ra))
        sb              v0, (a0)
@@ -51,35 +49,17 @@ LEAF(__strncpy_from_\func\()_asm)
        bne             t0, a2, 1b
 2:     PTR_ADDU        v0, a1, t0
        xor             v0, a1
-       bltz            v0, .Lfault\@
+       bltz            v0, .Lfault
        move            v0, t0
        jr              ra                      # return n
-       END(__strncpy_from_\func\()_asm)
+       END(__strncpy_from_user_asm)
 
-.Lfault\@:
+.Lfault:
        li              v0, -EFAULT
        jr              ra
 
        .section        __ex_table,"a"
-       PTR             1b, .Lfault\@
+       PTR             1b, .Lfault
        .previous
 
-       .endm
-
-#ifndef CONFIG_EVA
-       /* Set aliases */
-       .global __strncpy_from_user_asm
-       .set __strncpy_from_user_asm, __strncpy_from_kernel_asm
-EXPORT_SYMBOL(__strncpy_from_user_asm)
-#endif
-
-__BUILD_STRNCPY_ASM kernel
-EXPORT_SYMBOL(__strncpy_from_kernel_asm)
-
-#ifdef CONFIG_EVA
-       .set push
-       .set eva
-__BUILD_STRNCPY_ASM user
-       .set pop
-EXPORT_SYMBOL(__strncpy_from_user_asm)
-#endif
+       EXPORT_SYMBOL(__strncpy_from_user_asm)