diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-13 11:26:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-13 11:26:34 -0800 |
| commit | fae1aa4a0bcfdd35735a38949650216aee964474 (patch) | |
| tree | d733a7bcc3921e253d7010cdcaa39c83394e9c8f /arch/mips/include/asm/asmmacro.h | |
| parent | 1c55f18717304100a5f624c923f7cb6511b4116d (diff) | |
| parent | 6d8a52d7f09babf6cff1df32fe0b8ea47cf753f3 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: IP32: Update defconfig
MIPS: Add missing calls to plat_unmap_dma_mem.
MIPS: Kconfig: Fix the arch-specific header path
MIPS: Use EI/DI for MIPS R2.
Diffstat (limited to 'arch/mips/include/asm/asmmacro.h')
| -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 |