Skip to content

Commit f06d6e9

Browse files
committed
parisc: Use PRIV_USER instead of 3 in entry.S
Signed-off-by: Helge Deller <[email protected]>
1 parent 6ff7fa4 commit f06d6e9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/parisc/kernel/entry.S

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -826,10 +826,10 @@ ENTRY_CFI(syscall_exit_rfi)
826826
* context via sigcontext. Also Filter the PSW for the same reason.
827827
*/
828828
LDREG PT_IAOQ0(%r16),%r19
829-
depi 3,31,2,%r19
829+
depi PRIV_USER,31,2,%r19
830830
STREG %r19,PT_IAOQ0(%r16)
831831
LDREG PT_IAOQ1(%r16),%r19
832-
depi 3,31,2,%r19
832+
depi PRIV_USER,31,2,%r19
833833
STREG %r19,PT_IAOQ1(%r16)
834834
LDREG PT_PSW(%r16),%r19
835835
load32 USER_PSW_MASK,%r1
@@ -1873,7 +1873,7 @@ syscall_restore:
18731873
mtsp %r1,%sr5 /* Restore sr5 */
18741874
mtsp %r1,%sr6 /* Restore sr6 */
18751875

1876-
depi 3,31,2,%r31 /* ensure return to user mode. */
1876+
depi PRIV_USER,31,2,%r31 /* ensure return to user mode. */
18771877

18781878
#ifdef CONFIG_64BIT
18791879
/* decide whether to reset the wide mode bit
@@ -1949,7 +1949,7 @@ syscall_restore_rfi:
19491949
STREG %r0,TASK_PT_SR2(%r1)
19501950

19511951
LDREG TASK_PT_GR31(%r1),%r2
1952-
depi 3,31,2,%r2 /* ensure return to user mode. */
1952+
depi PRIV_USER,31,2,%r2 /* ensure return to user mode. */
19531953
STREG %r2,TASK_PT_IAOQ0(%r1)
19541954
ldo 4(%r2),%r2
19551955
STREG %r2,TASK_PT_IAOQ1(%r1)
@@ -1958,10 +1958,10 @@ syscall_restore_rfi:
19581958

19591959
pt_regs_ok:
19601960
LDREG TASK_PT_IAOQ0(%r1),%r2
1961-
depi 3,31,2,%r2 /* ensure return to user mode. */
1961+
depi PRIV_USER,31,2,%r2 /* ensure return to user mode. */
19621962
STREG %r2,TASK_PT_IAOQ0(%r1)
19631963
LDREG TASK_PT_IAOQ1(%r1),%r2
1964-
depi 3,31,2,%r2
1964+
depi PRIV_USER,31,2,%r2
19651965
STREG %r2,TASK_PT_IAOQ1(%r1)
19661966
b intr_restore
19671967
copy %r25,%r16

0 commit comments

Comments
 (0)