Update of /cvsroot/linux-vax/kernel-2.4/arch/s390x/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/s390x/lib
Modified Files:
uaccess.S
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)
Index: uaccess.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/s390x/lib/uaccess.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- uaccess.S 25 Feb 2001 23:15:23 -0000 1.1.1.1
+++ uaccess.S 10 Jun 2003 01:46:14 -0000 1.2
@@ -6,40 +6,82 @@
* Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Authors(s): Martin Schwidefsky (sch...@de...)
*
- * These functions have a non-standard call interface
+ * These functions have standard call interface
*/
#include <asm/lowcore.h>
.text
.align 4
- .globl __copy_from_user_fixup
-__copy_from_user_fixup:
- lg 1,__LC_PGM_OLD_PSW+8
-0: lghi 3,-4096
- ng 3,__LC_TRANS_EXC_ADDR
- sgr 3,4
- bm 4(1)
-1: mvcle 2,4,0
- b 4(1)
+ .globl __copy_from_user_asm
+__copy_from_user_asm:
+ lgr %r5,%r3
+ sacf 512
+0: mvcle %r2,%r4,0
+ jo 0b
+ sacf 0
+ lgr %r2,%r5
+ br %r14
+1: lg %r1,__LC_PGM_OLD_PSW+8
+2: lghi %r3,-4096
+ ng %r3,__LC_TRANS_EXC_ADDR
+ sgr %r3,%r4
+ bm 4(%r1)
+3: mvcle %r2,%r4,0
+ b 4(%r1)
.section __ex_table,"a"
- .align 8
- .quad 1b,0b
+ .align 8
+ .quad 0b,1b
+ .quad 3b,2b
.previous
.align 4
.text
- .globl __copy_to_user_fixup
-__copy_to_user_fixup:
- lg 1,__LC_PGM_OLD_PSW+8
-0: lghi 5,-4096
- ng 5,__LC_TRANS_EXC_ADDR
- sgr 5,4
- bm 4(1)
-1: mvcle 4,2,0
- b 4(1)
+ .globl __copy_to_user_asm
+__copy_to_user_asm:
+ lgr %r5,%r3
+ sacf 512
+0: mvcle %r4,%r2,0
+ jo 0b
+ sacf 0
+ lgr %r2,%r3
+ br %r14
+1: lg %r1,__LC_PGM_OLD_PSW+8
+2: lghi %r5,-4096
+ ng %r5,__LC_TRANS_EXC_ADDR
+ sgr %r5,%r4
+ bm 4(%r1)
+3: mvcle %r4,%r2,0
+ b 4(%r1)
.section __ex_table,"a"
- .align 8
- .quad 1b,0b
+ .align 8
+ .quad 0b,1b
+ .quad 3b,2b
.previous
+ .align 4
+ .text
+ .globl __clear_user_asm
+__clear_user_asm:
+ lgr %r4,%r2
+ lgr %r5,%r3
+ sgr %r2,%r2
+ sgr %r3,%r3
+ sacf 512
+0: mvcle %r4,%r2,0
+ jo 0b
+ sacf 0
+ lgr %r2,%r5
+ br %r14
+1: lg %r1,__LC_PGM_OLD_PSW+8
+2: lghi %r5,-4096
+ ng %r5,__LC_TRANS_EXC_ADDR
+ sgr %r5,%r4
+ bm 4(%r1)
+3: mvcle %r4,%r2,0
+ b 4(%r1)
+ .section __ex_table,"a"
+ .align 8
+ .quad 0b,1b
+ .quad 3b,2b
+ .previous
|
