diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:30 +0100 |
| commit | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (patch) | |
| tree | 3c644d508b67f9de2845b1e84f249f150e695c23 /arch/mips/include | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
| parent | 5279585ff2bedc8180da5bdf8aa3ff1736466de2 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/asmmacro.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h index 7a881755800..6c8342ae74d 100644 --- a/arch/mips/include/asm/asmmacro.h +++ b/arch/mips/include/asm/asmmacro.h @@ -35,6 +35,16 @@ mtc0 \reg, CP0_TCSTATUS _ehb .endm +#elif defined(CONFIG_CPU_MIPSR2) + .macro local_irq_enable reg=t0 + ei + irq_enable_hazard + .endm + + .macro local_irq_disable reg=t0 + di + irq_disable_hazard + .endm #else .macro local_irq_enable reg=t0 mfc0 \reg, CP0_STATUS |