Skip to content

Commit 71b0264

Browse files
danglin44ZhengShunQian
authored andcommitted
parisc: Remove ordered stores from syscall.S
commit 7797167 upstream. Now that we use a sync prior to releasing the locks in syscall.S, we don't need the PA 2.0 ordered stores used to release some locks.  Using an ordered store, potentially slows the release and subsequent code. There are a number of other ordered stores and loads that serve no purpose.  I have converted these to normal stores. Signed-off-by: John David Anglin <[email protected]> Cc: [email protected] # 4.0+ Signed-off-by: Helge Deller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ee3f65a commit 71b0264

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

arch/parisc/kernel/syscall.S

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,12 @@ cas_action:
627627
stw %r1, 4(%sr2,%r20)
628628
#endif
629629
/* The load and store could fail */
630-
1: ldw,ma 0(%r26), %r28
630+
1: ldw 0(%r26), %r28
631631
sub,<> %r28, %r25, %r0
632-
2: stw,ma %r24, 0(%r26)
632+
2: stw %r24, 0(%r26)
633633
/* Free lock */
634634
sync
635-
stw,ma %r20, 0(%sr2,%r20)
635+
stw %r20, 0(%sr2,%r20)
636636
#if ENABLE_LWS_DEBUG
637637
/* Clear thread register indicator */
638638
stw %r0, 4(%sr2,%r20)
@@ -796,41 +796,41 @@ cas2_action:
796796
ldo 1(%r0),%r28
797797

798798
/* 8bit CAS */
799-
13: ldb,ma 0(%r26), %r29
799+
13: ldb 0(%r26), %r29
800800
sub,= %r29, %r25, %r0
801801
b,n cas2_end
802-
14: stb,ma %r24, 0(%r26)
802+
14: stb %r24, 0(%r26)
803803
b cas2_end
804804
copy %r0, %r28
805805
nop
806806
nop
807807

808808
/* 16bit CAS */
809-
15: ldh,ma 0(%r26), %r29
809+
15: ldh 0(%r26), %r29
810810
sub,= %r29, %r25, %r0
811811
b,n cas2_end
812-
16: sth,ma %r24, 0(%r26)
812+
16: sth %r24, 0(%r26)
813813
b cas2_end
814814
copy %r0, %r28
815815
nop
816816
nop
817817

818818
/* 32bit CAS */
819-
17: ldw,ma 0(%r26), %r29
819+
17: ldw 0(%r26), %r29
820820
sub,= %r29, %r25, %r0
821821
b,n cas2_end
822-
18: stw,ma %r24, 0(%r26)
822+
18: stw %r24, 0(%r26)
823823
b cas2_end
824824
copy %r0, %r28
825825
nop
826826
nop
827827

828828
/* 64bit CAS */
829829
#ifdef CONFIG_64BIT
830-
19: ldd,ma 0(%r26), %r29
830+
19: ldd 0(%r26), %r29
831831
sub,*= %r29, %r25, %r0
832832
b,n cas2_end
833-
20: std,ma %r24, 0(%r26)
833+
20: std %r24, 0(%r26)
834834
copy %r0, %r28
835835
#else
836836
/* Compare first word */
@@ -849,7 +849,7 @@ cas2_action:
849849
cas2_end:
850850
/* Free lock */
851851
sync
852-
stw,ma %r20, 0(%sr2,%r20)
852+
stw %r20, 0(%sr2,%r20)
853853
/* Enable interrupts */
854854
ssm PSW_SM_I, %r0
855855
/* Return to userspace, set no error */

0 commit comments

Comments
 (0)