aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/genex.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/kernel/genex.S')
-rw-r--r--arch/mips/kernel/genex.S14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 8a0096d62812..ecb347ce1b3d 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -160,7 +160,7 @@ LEAF(r4k_wait)
160 .set pop 160 .set pop
161 .endm 161 .endm
162 162
163 .align 5 163 .align 5
164BUILD_ROLLBACK_PROLOGUE handle_int 164BUILD_ROLLBACK_PROLOGUE handle_int
165NESTED(handle_int, PT_SIZE, sp) 165NESTED(handle_int, PT_SIZE, sp)
166#ifdef CONFIG_TRACE_IRQFLAGS 166#ifdef CONFIG_TRACE_IRQFLAGS
@@ -362,7 +362,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
362 .set push 362 .set push
363 .set noat 363 .set noat
364 SAVE_ALL 364 SAVE_ALL
365 move a0, sp 365 move a0, sp
366 jal nmi_exception_handler 366 jal nmi_exception_handler
367 RESTORE_ALL 367 RESTORE_ALL
368 .set mips3 368 .set mips3
@@ -409,7 +409,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
409 string escapes and emits bogus warnings if it believes to 409 string escapes and emits bogus warnings if it believes to
410 recognize an unknown escape code. So make the arguments 410 recognize an unknown escape code. So make the arguments
411 start with an n and gas will believe \n is ok ... */ 411 start with an n and gas will believe \n is ok ... */
412 .macro __BUILD_verbose nexception 412 .macro __BUILD_verbose nexception
413 LONG_L a1, PT_EPC(sp) 413 LONG_L a1, PT_EPC(sp)
414#ifdef CONFIG_32BIT 414#ifdef CONFIG_32BIT
415 PRINT("Got \nexception at %08lx\012") 415 PRINT("Got \nexception at %08lx\012")
@@ -442,7 +442,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
442 .endm 442 .endm
443 443
444 .macro BUILD_HANDLER exception handler clear verbose 444 .macro BUILD_HANDLER exception handler clear verbose
445 __BUILD_HANDLER \exception \handler \clear \verbose _int 445 __BUILD_HANDLER \exception \handler \clear \verbose _int
446 .endm 446 .endm
447 447
448 BUILD_HANDLER adel ade ade silent /* #4 */ 448 BUILD_HANDLER adel ade ade silent /* #4 */
@@ -456,7 +456,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
456 BUILD_HANDLER tr tr sti silent /* #13 */ 456 BUILD_HANDLER tr tr sti silent /* #13 */
457 BUILD_HANDLER fpe fpe fpe silent /* #15 */ 457 BUILD_HANDLER fpe fpe fpe silent /* #15 */
458 BUILD_HANDLER mdmx mdmx sti silent /* #22 */ 458 BUILD_HANDLER mdmx mdmx sti silent /* #22 */
459#ifdef CONFIG_HARDWARE_WATCHPOINTS 459#ifdef CONFIG_HARDWARE_WATCHPOINTS
460 /* 460 /*
461 * For watch, interrupts will be enabled after the watch 461 * For watch, interrupts will be enabled after the watch
462 * registers are read. 462 * registers are read.
@@ -482,8 +482,8 @@ NESTED(nmi_handler, PT_SIZE, sp)
482 MFC0 k1, CP0_ENTRYHI 482 MFC0 k1, CP0_ENTRYHI
483 andi k1, 0xff /* ASID_MASK */ 483 andi k1, 0xff /* ASID_MASK */
484 MFC0 k0, CP0_EPC 484 MFC0 k0, CP0_EPC
485 PTR_SRL k0, _PAGE_SHIFT + 1 485 PTR_SRL k0, _PAGE_SHIFT + 1
486 PTR_SLL k0, _PAGE_SHIFT + 1 486 PTR_SLL k0, _PAGE_SHIFT + 1
487 or k1, k0 487 or k1, k0
488 MTC0 k1, CP0_ENTRYHI 488 MTC0 k1, CP0_ENTRYHI
489 mtc0_tlbw_hazard 489 mtc0_tlbw_hazard