.. | .. |
---|
424 | 424 | |
---|
425 | 425 | .macro RESTORE_SP_AND_RET docfi=0 |
---|
426 | 426 | RESTORE_SP \docfi |
---|
427 | | -#ifdef CONFIG_CPU_MIPSR6 |
---|
| 427 | +#if defined(CONFIG_CPU_MIPSR5) || defined(CONFIG_CPU_MIPSR6) |
---|
428 | 428 | eretnc |
---|
429 | 429 | #else |
---|
| 430 | + .set push |
---|
430 | 431 | .set arch=r4000 |
---|
431 | 432 | eret |
---|
432 | | - .set mips0 |
---|
| 433 | + .set pop |
---|
433 | 434 | #endif |
---|
434 | 435 | .endm |
---|
435 | 436 | |
---|
.. | .. |
---|
449 | 450 | */ |
---|
450 | 451 | .macro CLI |
---|
451 | 452 | mfc0 t0, CP0_STATUS |
---|
452 | | - li t1, ST0_CU0 | STATMASK |
---|
| 453 | + li t1, ST0_KERNEL_CUMASK | STATMASK |
---|
453 | 454 | or t0, t1 |
---|
454 | 455 | xori t0, STATMASK |
---|
455 | 456 | mtc0 t0, CP0_STATUS |
---|
.. | .. |
---|
462 | 463 | */ |
---|
463 | 464 | .macro STI |
---|
464 | 465 | mfc0 t0, CP0_STATUS |
---|
465 | | - li t1, ST0_CU0 | STATMASK |
---|
| 466 | + li t1, ST0_KERNEL_CUMASK | STATMASK |
---|
466 | 467 | or t0, t1 |
---|
467 | 468 | xori t0, STATMASK & ~1 |
---|
468 | 469 | mtc0 t0, CP0_STATUS |
---|
.. | .. |
---|
476 | 477 | */ |
---|
477 | 478 | .macro KMODE |
---|
478 | 479 | mfc0 t0, CP0_STATUS |
---|
479 | | - li t1, ST0_CU0 | (STATMASK & ~1) |
---|
| 480 | + li t1, ST0_KERNEL_CUMASK | (STATMASK & ~1) |
---|
480 | 481 | #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX) |
---|
481 | 482 | andi t2, t0, ST0_IEP |
---|
482 | 483 | srl t2, 2 |
---|