renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-13 08:04:45 +08:00
Code

parisc: Use PRIV_USER instead of 3 in entry.S

Browse Source 
Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Helge Deller 2021-10-04 23:57:04 +02:00
parent 6ff7fa4b23
commit f06d6e92c8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/parisc/kernel/entry.S
View File

@ -826,10 +826,10 @@ ENTRY_CFI(syscall_exit_rfi)
* context via sigcontext. Also Filter the PSW for the same reason. * context via sigcontext. Also Filter the PSW for the same reason.
*/ */
LDREG PT_IAOQ0(%r16),%r19 LDREG PT_IAOQ0(%r16),%r19
depi 3,31,2,%r19 depi PRIV_USER,31,2,%r19
STREG %r19,PT_IAOQ0(%r16) STREG %r19,PT_IAOQ0(%r16)
LDREG PT_IAOQ1(%r16),%r19 LDREG PT_IAOQ1(%r16),%r19
depi 3,31,2,%r19 depi PRIV_USER,31,2,%r19
STREG %r19,PT_IAOQ1(%r16) STREG %r19,PT_IAOQ1(%r16)
LDREG PT_PSW(%r16),%r19 LDREG PT_PSW(%r16),%r19
load32 USER_PSW_MASK,%r1 load32 USER_PSW_MASK,%r1
@ -1873,7 +1873,7 @@ syscall_restore:
mtsp %r1,%sr5 /* Restore sr5 */ mtsp %r1,%sr5 /* Restore sr5 */
mtsp %r1,%sr6 /* Restore sr6 */ mtsp %r1,%sr6 /* Restore sr6 */
depi 3,31,2,%r31 /* ensure return to user mode. */ depi PRIV_USER,31,2,%r31 /* ensure return to user mode. */
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
/* decide whether to reset the wide mode bit /* decide whether to reset the wide mode bit
@ -1949,7 +1949,7 @@ syscall_restore_rfi:
STREG %r0,TASK_PT_SR2(%r1) STREG %r0,TASK_PT_SR2(%r1)
LDREG TASK_PT_GR31(%r1),%r2 LDREG TASK_PT_GR31(%r1),%r2
depi 3,31,2,%r2 /* ensure return to user mode. */ depi PRIV_USER,31,2,%r2 /* ensure return to user mode. */
STREG %r2,TASK_PT_IAOQ0(%r1) STREG %r2,TASK_PT_IAOQ0(%r1)
ldo 4(%r2),%r2 ldo 4(%r2),%r2
STREG %r2,TASK_PT_IAOQ1(%r1) STREG %r2,TASK_PT_IAOQ1(%r1)
@ -1958,10 +1958,10 @@ syscall_restore_rfi:
pt_regs_ok: pt_regs_ok:
LDREG TASK_PT_IAOQ0(%r1),%r2 LDREG TASK_PT_IAOQ0(%r1),%r2
depi 3,31,2,%r2 /* ensure return to user mode. */ depi PRIV_USER,31,2,%r2 /* ensure return to user mode. */
STREG %r2,TASK_PT_IAOQ0(%r1) STREG %r2,TASK_PT_IAOQ0(%r1)
LDREG TASK_PT_IAOQ1(%r1),%r2 LDREG TASK_PT_IAOQ1(%r1),%r2
depi 3,31,2,%r2 depi PRIV_USER,31,2,%r2
STREG %r2,TASK_PT_IAOQ1(%r1) STREG %r2,TASK_PT_IAOQ1(%r1)
b intr_restore b intr_restore
copy %r25,%r16 copy %r25,%r16