diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 17:37:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 17:37:20 -0400 |
| commit | b1a8d700e7fdf1bc44000e3edc24cc43f904df50 (patch) | |
| tree | 60d101b813135274f1c2366bae1693d6d72e3681 /include/asm-m32r/assembler.h | |
| parent | 53f7b9bccd332bba39be78f9085ac1a26fa387fc (diff) | |
| parent | 7071b2914a540b43dfcad17f6892a8c115799d50 (diff) | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: Rename STI/CLI macros
m32r: build fix of entry.S
m32r: Separate syscall table from entry.S
m32r: Cosmetic updates of arch/m32r/kernel/entry.S
m32r: Exit ei_handler directly for no IRQ case or IPI operations
m32r: Simplify ei_handler code
m32r: Define symbols to unify platform-dependent ICU checks
m32r: Move dot.gdbinit files
m32r: Rearrange platform-dependent codes
m32r: Add defconfig file for the usrv platform.
m32r: Update defconfig files for 2.6.23-rc1
m32r: Move defconfig files to arch/m32r/configs/
Diffstat (limited to 'include/asm-m32r/assembler.h')
| -rw-r--r-- | include/asm-m32r/assembler.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-m32r/assembler.h b/include/asm-m32r/assembler.h index 47041d19d4a8..26351539b5ff 100644 --- a/include/asm-m32r/assembler.h +++ b/include/asm-m32r/assembler.h | |||
| @@ -52,27 +52,27 @@ | |||
| 52 | .endm | 52 | .endm |
| 53 | 53 | ||
| 54 | #if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104)) | 54 | #if !(defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_M32104)) |
| 55 | #define STI(reg) STI_M reg | 55 | #define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg |
| 56 | .macro STI_M reg | 56 | .macro ENABLE_INTERRUPTS reg |
| 57 | setpsw #0x40 -> nop | 57 | setpsw #0x40 -> nop |
| 58 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). | 58 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). |
| 59 | .endm | 59 | .endm |
| 60 | 60 | ||
| 61 | #define CLI(reg) CLI_M reg | 61 | #define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg |
| 62 | .macro CLI_M reg | 62 | .macro DISABLE_INTERRUPTS reg |
| 63 | clrpsw #0x40 -> nop | 63 | clrpsw #0x40 -> nop |
| 64 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). | 64 | ; WORKAROUND: "-> nop" is a workaround for the M32700(TS1). |
| 65 | .endm | 65 | .endm |
| 66 | #else /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */ | 66 | #else /* CONFIG_CHIP_M32102 || CONFIG_CHIP_M32104 */ |
| 67 | #define STI(reg) STI_M reg | 67 | #define ENABLE_INTERRUPTS(reg) ENABLE_INTERRUPTS reg |
| 68 | .macro STI_M reg | 68 | .macro ENABLE_INTERRUPTS reg |
| 69 | mvfc \reg, psw | 69 | mvfc \reg, psw |
| 70 | or3 \reg, \reg, #0x0040 | 70 | or3 \reg, \reg, #0x0040 |
| 71 | mvtc \reg, psw | 71 | mvtc \reg, psw |
| 72 | .endm | 72 | .endm |
| 73 | 73 | ||
| 74 | #define CLI(reg) CLI_M reg | 74 | #define DISABLE_INTERRUPTS(reg) DISABLE_INTERRUPTS reg |
| 75 | .macro CLI_M reg | 75 | .macro DISABLE_INTERRUPTS reg |
| 76 | mvfc \reg, psw | 76 | mvfc \reg, psw |
| 77 | and3 \reg, \reg, #0xffbf | 77 | and3 \reg, \reg, #0xffbf |
| 78 | mvtc \reg, psw | 78 | mvtc \reg, psw |