diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:30 -0500 |
| 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 7a881755800f..6c8342ae74db 100644 --- a/arch/mips/include/asm/asmmacro.h +++ b/arch/mips/include/asm/asmmacro.h | |||
| @@ -35,6 +35,16 @@ | |||
| 35 | mtc0 \reg, CP0_TCSTATUS | 35 | mtc0 \reg, CP0_TCSTATUS |
| 36 | _ehb | 36 | _ehb |
| 37 | .endm | 37 | .endm |
| 38 | #elif defined(CONFIG_CPU_MIPSR2) | ||
| 39 | .macro local_irq_enable reg=t0 | ||
| 40 | ei | ||
| 41 | irq_enable_hazard | ||
| 42 | .endm | ||
| 43 | |||
| 44 | .macro local_irq_disable reg=t0 | ||
| 45 | di | ||
| 46 | irq_disable_hazard | ||
| 47 | .endm | ||
| 38 | #else | 48 | #else |
| 39 | .macro local_irq_enable reg=t0 | 49 | .macro local_irq_enable reg=t0 |
| 40 | mfc0 \reg, CP0_STATUS | 50 | mfc0 \reg, CP0_STATUS |