git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
sibyte
/
sb1250
/
irq.c
diff --git
a/arch/mips/sibyte/sb1250/irq.c
b/arch/mips/sibyte/sb1250/irq.c
index 148239446e6e598c732111058847769b0388d5a4..0e6a13c0bd0e6cd294ac5a6a8cb54d9b965e792f 100644
(file)
--- a/
arch/mips/sibyte/sb1250/irq.c
+++ b/
arch/mips/sibyte/sb1250/irq.c
@@
-421,7
+421,7
@@
asmlinkage void plat_irq_dispatch(void)
* blasting the high 32 bits.
*/
- pending = read_c0_cause() & read_c0_status();
+ pending = read_c0_cause() & read_c0_status()
& ST0_IM
;
#ifdef CONFIG_SIBYTE_SB1250_PROF
if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */