projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'hsi-for-3.16-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
lib
/
copyuser_power7.S
diff --git
a/arch/powerpc/lib/copyuser_power7.S
b/arch/powerpc/lib/copyuser_power7.S
index e8e9c36dc7844455c4b24356cdff5f9ed9e70aff..c46c876ac96af693445e91da8204ade16169ece6 100644
(file)
--- a/
arch/powerpc/lib/copyuser_power7.S
+++ b/
arch/powerpc/lib/copyuser_power7.S
@@
-66,7
+66,7
@@
ld r15,STK_REG(R15)(r1)
ld r14,STK_REG(R14)(r1)
.Ldo_err3:
ld r15,STK_REG(R15)(r1)
ld r14,STK_REG(R14)(r1)
.Ldo_err3:
- bl
.
exit_vmx_usercopy
+ bl exit_vmx_usercopy
ld r0,STACKFRAMESIZE+16(r1)
mtlr r0
b .Lexit
ld r0,STACKFRAMESIZE+16(r1)
mtlr r0
b .Lexit
@@
-85,9
+85,9
@@
.Lexit:
addi r1,r1,STACKFRAMESIZE
.Ldo_err1:
.Lexit:
addi r1,r1,STACKFRAMESIZE
.Ldo_err1:
- ld r3,
48
(r1)
- ld r4,
56
(r1)
- ld r5,
64
(r1)
+ ld r3,
-STACKFRAMESIZE+STK_REG(R31)
(r1)
+ ld r4,
-STACKFRAMESIZE+STK_REG(R30)
(r1)
+ ld r5,
-STACKFRAMESIZE+STK_REG(R29)
(r1)
b __copy_tofrom_user_base
b __copy_tofrom_user_base
@@
-96,18
+96,18
@@
_GLOBAL(__copy_tofrom_user_power7)
cmpldi r5,16
cmpldi cr1,r5,4096
cmpldi r5,16
cmpldi cr1,r5,4096
- std r3,
48
(r1)
- std r4,
56
(r1)
- std r5,
64
(r1)
+ std r3,
-STACKFRAMESIZE+STK_REG(R31)
(r1)
+ std r4,
-STACKFRAMESIZE+STK_REG(R30)
(r1)
+ std r5,
-STACKFRAMESIZE+STK_REG(R29)
(r1)
blt .Lshort_copy
bgt cr1,.Lvmx_copy
#else
cmpldi r5,16
blt .Lshort_copy
bgt cr1,.Lvmx_copy
#else
cmpldi r5,16
- std r3,
48
(r1)
- std r4,
56
(r1)
- std r5,
64
(r1)
+ std r3,
-STACKFRAMESIZE+STK_REG(R31)
(r1)
+ std r4,
-STACKFRAMESIZE+STK_REG(R30)
(r1)
+ std r5,
-STACKFRAMESIZE+STK_REG(R29)
(r1)
blt .Lshort_copy
#endif
blt .Lshort_copy
#endif
@@
-295,12
+295,12
@@
err1; stb r0,0(r3)
mflr r0
std r0,16(r1)
stdu r1,-STACKFRAMESIZE(r1)
mflr r0
std r0,16(r1)
stdu r1,-STACKFRAMESIZE(r1)
- bl
.
enter_vmx_usercopy
+ bl enter_vmx_usercopy
cmpwi cr1,r3,0
ld r0,STACKFRAMESIZE+16(r1)
cmpwi cr1,r3,0
ld r0,STACKFRAMESIZE+16(r1)
- ld r3,ST
ACKFRAMESIZE+48
(r1)
- ld r4,ST
ACKFRAMESIZE+56
(r1)
- ld r5,ST
ACKFRAMESIZE+64
(r1)
+ ld r3,ST
K_REG(R31)
(r1)
+ ld r4,ST
K_REG(R30)
(r1)
+ ld r5,ST
K_REG(R29)
(r1)
mtlr r0
/*
mtlr r0
/*
@@
-514,7
+514,7
@@
err3; lbz r0,0(r4)
err3; stb r0,0(r3)
15: addi r1,r1,STACKFRAMESIZE
err3; stb r0,0(r3)
15: addi r1,r1,STACKFRAMESIZE
- b
.exit_vmx_usercopy
/* tail call optimise */
+ b
exit_vmx_usercopy
/* tail call optimise */
.Lvmx_unaligned_copy:
/* Get the destination 16B aligned */
.Lvmx_unaligned_copy:
/* Get the destination 16B aligned */
@@
-717,5
+717,5
@@
err3; lbz r0,0(r4)
err3; stb r0,0(r3)
15: addi r1,r1,STACKFRAMESIZE
err3; stb r0,0(r3)
15: addi r1,r1,STACKFRAMESIZE
- b
.exit_vmx_usercopy
/* tail call optimise */
+ b
exit_vmx_usercopy
/* tail call optimise */
#endif /* CONFiG_ALTIVEC */
#endif /* CONFiG_ALTIVEC */