diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 12:00:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 12:00:55 -0500 |
| commit | d936cfc72032fb4af03d1edd99596d18ea1f081c (patch) | |
| tree | 6d524c57fbff717ba82c6f4925659f6ec901d45d /include/asm-mips/interrupt.h | |
| parent | 4f47707b056bd2e3627ef390557ee93d312daba5 (diff) | |
| parent | adfc76419bff33542d4fd53dc7f24818f846f194 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/interrupt.h')
| -rw-r--r-- | include/asm-mips/interrupt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/interrupt.h b/include/asm-mips/interrupt.h index a5735761f5e5..abdf54ee64cf 100644 --- a/include/asm-mips/interrupt.h +++ b/include/asm-mips/interrupt.h | |||
| @@ -93,6 +93,7 @@ __asm__ ( | |||
| 93 | " .set noat \n" | 93 | " .set noat \n" |
| 94 | #ifdef CONFIG_CPU_MIPSR2 | 94 | #ifdef CONFIG_CPU_MIPSR2 |
| 95 | " di \\result \n" | 95 | " di \\result \n" |
| 96 | " andi \\result, 1 \n" | ||
| 96 | #else | 97 | #else |
| 97 | " mfc0 \\result, $12 \n" | 98 | " mfc0 \\result, $12 \n" |
| 98 | " ori $1, \\result, 1 \n" | 99 | " ori $1, \\result, 1 \n" |