diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 12:59:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 12:59:43 -0800 |
| commit | d4d37bde3d036cfce240c12144ea9e80ce3ee5d0 (patch) | |
| tree | 858277db13a3b6a0522ee58c2e1e13fefb4f90f2 /arch/mips/kernel/cevt-r4k.c | |
| parent | 551e28dbe82f9de58993d7587201a2569b942341 (diff) | |
| parent | 010c108d7af708d9e09b83724a058a76803fbc66 (diff) | |
| download | linux-stable-d4d37bde3d036cfce240c12144ea9e80ce3ee5d0.tar.gz linux-stable-d4d37bde3d036cfce240c12144ea9e80ce3ee5d0.tar.bz2 linux-stable-d4d37bde3d036cfce240c12144ea9e80ce3ee5d0.zip | |
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: PowerTV: Fix support for timer interrupts with > 64 external IRQs
MIPS: PowerTV: Streamline access to platform device registers
MIPS: Fix vmlinuz build for 32bit-only math shells
MIPS: Add support of LZO-compressed kernels
Diffstat (limited to 'arch/mips/kernel/cevt-r4k.c')
| -rw-r--r-- | arch/mips/kernel/cevt-r4k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c index b469ad05d520..0b2450ceb13f 100644 --- a/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c @@ -97,7 +97,7 @@ void mips_event_handler(struct clock_event_device *dev) */ static int c0_compare_int_pending(void) { - return (read_c0_cause() >> cp0_compare_irq) & 0x100; + return (read_c0_cause() >> cp0_compare_irq_shift) & (1ul << CAUSEB_IP); } /* |