diff options
Diffstat (limited to 'arch/s390/lib/uaccess_mvcos.c')
-rw-r--r-- | arch/s390/lib/uaccess_mvcos.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c index 3f15aaf54855..58da3f461214 100644 --- a/arch/s390/lib/uaccess_mvcos.c +++ b/arch/s390/lib/uaccess_mvcos.c | |||
@@ -36,7 +36,7 @@ static size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x) | |||
36 | tmp1 = -4096UL; | 36 | tmp1 = -4096UL; |
37 | asm volatile( | 37 | asm volatile( |
38 | "0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n" | 38 | "0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n" |
39 | " jz 7f\n" | 39 | "9: jz 7f\n" |
40 | "1:"ALR" %0,%3\n" | 40 | "1:"ALR" %0,%3\n" |
41 | " "SLR" %1,%3\n" | 41 | " "SLR" %1,%3\n" |
42 | " "SLR" %2,%3\n" | 42 | " "SLR" %2,%3\n" |
@@ -47,7 +47,7 @@ static size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x) | |||
47 | " "CLR" %0,%4\n" /* copy crosses next page boundary? */ | 47 | " "CLR" %0,%4\n" /* copy crosses next page boundary? */ |
48 | " jnh 4f\n" | 48 | " jnh 4f\n" |
49 | "3: .insn ss,0xc80000000000,0(%4,%2),0(%1),0\n" | 49 | "3: .insn ss,0xc80000000000,0(%4,%2),0(%1),0\n" |
50 | " "SLR" %0,%4\n" | 50 | "10:"SLR" %0,%4\n" |
51 | " "ALR" %2,%4\n" | 51 | " "ALR" %2,%4\n" |
52 | "4:"LHI" %4,-1\n" | 52 | "4:"LHI" %4,-1\n" |
53 | " "ALR" %4,%0\n" /* copy remaining size, subtract 1 */ | 53 | " "ALR" %4,%0\n" /* copy remaining size, subtract 1 */ |
@@ -61,7 +61,7 @@ static size_t copy_from_user_mvcos(size_t size, const void __user *ptr, void *x) | |||
61 | " j 8f\n" | 61 | " j 8f\n" |
62 | "7:"SLR" %0,%0\n" | 62 | "7:"SLR" %0,%0\n" |
63 | "8: \n" | 63 | "8: \n" |
64 | EX_TABLE(0b,2b) EX_TABLE(3b,4b) | 64 | EX_TABLE(0b,2b) EX_TABLE(3b,4b) EX_TABLE(9b,2b) EX_TABLE(10b,4b) |
65 | : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) | 65 | : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) |
66 | : "d" (reg0) : "cc", "memory"); | 66 | : "d" (reg0) : "cc", "memory"); |
67 | return size; | 67 | return size; |
@@ -82,7 +82,7 @@ static size_t copy_to_user_mvcos(size_t size, void __user *ptr, const void *x) | |||
82 | tmp1 = -4096UL; | 82 | tmp1 = -4096UL; |
83 | asm volatile( | 83 | asm volatile( |
84 | "0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n" | 84 | "0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n" |
85 | " jz 4f\n" | 85 | "6: jz 4f\n" |
86 | "1:"ALR" %0,%3\n" | 86 | "1:"ALR" %0,%3\n" |
87 | " "SLR" %1,%3\n" | 87 | " "SLR" %1,%3\n" |
88 | " "SLR" %2,%3\n" | 88 | " "SLR" %2,%3\n" |
@@ -93,11 +93,11 @@ static size_t copy_to_user_mvcos(size_t size, void __user *ptr, const void *x) | |||
93 | " "CLR" %0,%4\n" /* copy crosses next page boundary? */ | 93 | " "CLR" %0,%4\n" /* copy crosses next page boundary? */ |
94 | " jnh 5f\n" | 94 | " jnh 5f\n" |
95 | "3: .insn ss,0xc80000000000,0(%4,%1),0(%2),0\n" | 95 | "3: .insn ss,0xc80000000000,0(%4,%1),0(%2),0\n" |
96 | " "SLR" %0,%4\n" | 96 | "7:"SLR" %0,%4\n" |
97 | " j 5f\n" | 97 | " j 5f\n" |
98 | "4:"SLR" %0,%0\n" | 98 | "4:"SLR" %0,%0\n" |
99 | "5: \n" | 99 | "5: \n" |
100 | EX_TABLE(0b,2b) EX_TABLE(3b,5b) | 100 | EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b) |
101 | : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) | 101 | : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) |
102 | : "d" (reg0) : "cc", "memory"); | 102 | : "d" (reg0) : "cc", "memory"); |
103 | return size; | 103 | return size; |