diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-10-07 11:58:15 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:37 -0400 |
| commit | ec917c2c1ab4359a1d438e62daeb50cc42e632e1 (patch) | |
| tree | deb2e00bee354577e1f19b7b70c1a2037828a957 /include/asm-mips/interrupt.h | |
| parent | f92c1759a40a85f52b835c21b0ef6ce556b340c5 (diff) | |
Fixup a few lose ends in explicit support for MIPS R1/R2.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/interrupt.h')
| -rw-r--r-- | include/asm-mips/interrupt.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/asm-mips/interrupt.h b/include/asm-mips/interrupt.h index 0ba99f019be9..a5735761f5e5 100644 --- a/include/asm-mips/interrupt.h +++ b/include/asm-mips/interrupt.h | |||
| @@ -19,7 +19,7 @@ __asm__ ( | |||
| 19 | " .set push \n" | 19 | " .set push \n" |
| 20 | " .set reorder \n" | 20 | " .set reorder \n" |
| 21 | " .set noat \n" | 21 | " .set noat \n" |
| 22 | #if defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS64_R2) | 22 | #ifdef CONFIG_CPU_MIPSR2 |
| 23 | " ei \n" | 23 | " ei \n" |
| 24 | #else | 24 | #else |
| 25 | " mfc0 $1,$12 \n" | 25 | " mfc0 $1,$12 \n" |
| @@ -51,7 +51,7 @@ __asm__ ( | |||
| 51 | " .macro local_irq_disable\n" | 51 | " .macro local_irq_disable\n" |
| 52 | " .set push \n" | 52 | " .set push \n" |
| 53 | " .set noat \n" | 53 | " .set noat \n" |
| 54 | #if defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS64_R2) | 54 | #ifdef CONFIG_CPU_MIPSR2 |
| 55 | " di \n" | 55 | " di \n" |
| 56 | #else | 56 | #else |
| 57 | " mfc0 $1,$12 \n" | 57 | " mfc0 $1,$12 \n" |
| @@ -91,7 +91,7 @@ __asm__ ( | |||
| 91 | " .set push \n" | 91 | " .set push \n" |
| 92 | " .set reorder \n" | 92 | " .set reorder \n" |
| 93 | " .set noat \n" | 93 | " .set noat \n" |
| 94 | #if defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS64_R2) | 94 | #ifdef CONFIG_CPU_MIPSR2 |
| 95 | " di \\result \n" | 95 | " di \\result \n" |
| 96 | #else | 96 | #else |
| 97 | " mfc0 \\result, $12 \n" | 97 | " mfc0 \\result, $12 \n" |
| @@ -115,8 +115,7 @@ __asm__ ( | |||
| 115 | " .macro local_irq_restore flags \n" | 115 | " .macro local_irq_restore flags \n" |
| 116 | " .set noreorder \n" | 116 | " .set noreorder \n" |
| 117 | " .set noat \n" | 117 | " .set noat \n" |
| 118 | #if (defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS64_R2)) && \ | 118 | #if defined(CONFIG_CPU_MIPSR2) && defined(CONFIG_IRQ_CPU) |
| 119 | defined(CONFIG_IRQ_CPU) | ||
| 120 | /* | 119 | /* |
| 121 | * Slow, but doesn't suffer from a relativly unlikely race | 120 | * Slow, but doesn't suffer from a relativly unlikely race |
| 122 | * condition we're having since days 1. | 121 | * condition we're having since days 1. |
| @@ -125,7 +124,7 @@ __asm__ ( | |||
| 125 | " di \n" | 124 | " di \n" |
| 126 | " ei \n" | 125 | " ei \n" |
| 127 | "1: \n" | 126 | "1: \n" |
| 128 | #elif defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS64_R2) | 127 | #elif defined(CONFIG_CPU_MIPSR2) |
| 129 | /* | 128 | /* |
| 130 | * Fast, dangerous. Life is fun, life is good. | 129 | * Fast, dangerous. Life is fun, life is good. |
| 131 | */ | 130 | */ |