diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-07 09:07:18 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-07-13 16:26:09 -0400 |
commit | 192ef366198ce16c0379100565cdc5b7bd68511f (patch) | |
tree | 1f4ef0a9ee796fbf970b6f0703aa31ecad584ee1 /arch/mips/kernel/genex.S | |
parent | 8d197f3d17d4f43eb7d032491af7fc959cbed4fa (diff) |
[MIPS] TRACE_IRQFLAGS_SUPPORT support.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/genex.S')
-rw-r--r-- | arch/mips/kernel/genex.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index b563811b1b27..37fda3dcdfc5 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
14 | #include <asm/asmmacro.h> | 14 | #include <asm/asmmacro.h> |
15 | #include <asm/cacheops.h> | 15 | #include <asm/cacheops.h> |
16 | #include <asm/irqflags.h> | ||
16 | #include <asm/regdef.h> | 17 | #include <asm/regdef.h> |
17 | #include <asm/fpregdef.h> | 18 | #include <asm/fpregdef.h> |
18 | #include <asm/mipsregs.h> | 19 | #include <asm/mipsregs.h> |
@@ -128,6 +129,7 @@ handle_vcei: | |||
128 | NESTED(handle_int, PT_SIZE, sp) | 129 | NESTED(handle_int, PT_SIZE, sp) |
129 | SAVE_ALL | 130 | SAVE_ALL |
130 | CLI | 131 | CLI |
132 | TRACE_IRQS_OFF | ||
131 | 133 | ||
132 | PTR_LA ra, ret_from_irq | 134 | PTR_LA ra, ret_from_irq |
133 | move a0, sp | 135 | move a0, sp |
@@ -216,6 +218,7 @@ NESTED(except_vec_vi_handler, 0, sp) | |||
216 | _ehb | 218 | _ehb |
217 | #endif /* CONFIG_MIPS_MT_SMTC */ | 219 | #endif /* CONFIG_MIPS_MT_SMTC */ |
218 | CLI | 220 | CLI |
221 | TRACE_IRQS_OFF | ||
219 | move a0, sp | 222 | move a0, sp |
220 | jalr v0 | 223 | jalr v0 |
221 | j ret_from_irq | 224 | j ret_from_irq |
@@ -288,11 +291,13 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
288 | .endm | 291 | .endm |
289 | 292 | ||
290 | .macro __build_clear_sti | 293 | .macro __build_clear_sti |
294 | TRACE_IRQS_ON | ||
291 | STI | 295 | STI |
292 | .endm | 296 | .endm |
293 | 297 | ||
294 | .macro __build_clear_cli | 298 | .macro __build_clear_cli |
295 | CLI | 299 | CLI |
300 | TRACE_IRQS_OFF | ||
296 | .endm | 301 | .endm |
297 | 302 | ||
298 | .macro __build_clear_fpe | 303 | .macro __build_clear_fpe |
@@ -300,6 +305,7 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
300 | li a2, ~(0x3f << 12) | 305 | li a2, ~(0x3f << 12) |
301 | and a2, a1 | 306 | and a2, a1 |
302 | ctc1 a2, fcr31 | 307 | ctc1 a2, fcr31 |
308 | TRACE_IRQS_ON | ||
303 | STI | 309 | STI |
304 | .endm | 310 | .endm |
305 | 311 | ||