hc
2024-05-10 10ebd8556b7990499c896a550e3d416b444211e6
kernel/arch/mips/include/asm/stackframe.h
....@@ -424,12 +424,13 @@
424424
425425 .macro RESTORE_SP_AND_RET docfi=0
426426 RESTORE_SP \docfi
427
-#ifdef CONFIG_CPU_MIPSR6
427
+#if defined(CONFIG_CPU_MIPSR5) || defined(CONFIG_CPU_MIPSR6)
428428 eretnc
429429 #else
430
+ .set push
430431 .set arch=r4000
431432 eret
432
- .set mips0
433
+ .set pop
433434 #endif
434435 .endm
435436
....@@ -449,7 +450,7 @@
449450 */
450451 .macro CLI
451452 mfc0 t0, CP0_STATUS
452
- li t1, ST0_CU0 | STATMASK
453
+ li t1, ST0_KERNEL_CUMASK | STATMASK
453454 or t0, t1
454455 xori t0, STATMASK
455456 mtc0 t0, CP0_STATUS
....@@ -462,7 +463,7 @@
462463 */
463464 .macro STI
464465 mfc0 t0, CP0_STATUS
465
- li t1, ST0_CU0 | STATMASK
466
+ li t1, ST0_KERNEL_CUMASK | STATMASK
466467 or t0, t1
467468 xori t0, STATMASK & ~1
468469 mtc0 t0, CP0_STATUS
....@@ -476,7 +477,7 @@
476477 */
477478 .macro KMODE
478479 mfc0 t0, CP0_STATUS
479
- li t1, ST0_CU0 | (STATMASK & ~1)
480
+ li t1, ST0_KERNEL_CUMASK | (STATMASK & ~1)
480481 #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
481482 andi t2, t0, ST0_IEP
482483 srl t2, 2