diff options
| author | Thomas Langer <thomas.langer@lantiq.com> | 2008-12-16 14:07:55 +0000 |
|---|---|---|
| committer | Thomas Langer <thomas.langer@lantiq.com> | 2008-12-16 14:07:55 +0000 |
| commit | 7570eebcdd5628978cbdbab2fb7cb99abbc62360 (patch) | |
| tree | 46e045fd88294505c849b475f46e1556278ae300 /target/linux/ifxmips/patches/000-mips-bad-intctl.patch | |
| parent | e7336673b14fe311ae493eee86ba8983792bcf02 (diff) | |
| download | master-31e0f0ae-7570eebcdd5628978cbdbab2fb7cb99abbc62360.tar.gz master-31e0f0ae-7570eebcdd5628978cbdbab2fb7cb99abbc62360.tar.bz2 master-31e0f0ae-7570eebcdd5628978cbdbab2fb7cb99abbc62360.zip | |
cleanup sources and prepare for 2.6.27
SVN-Revision: 13660
Diffstat (limited to 'target/linux/ifxmips/patches/000-mips-bad-intctl.patch')
| -rw-r--r-- | target/linux/ifxmips/patches/000-mips-bad-intctl.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/ifxmips/patches/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches/000-mips-bad-intctl.patch new file mode 100644 index 0000000000..3b1c2dc7c2 --- /dev/null +++ b/target/linux/ifxmips/patches/000-mips-bad-intctl.patch @@ -0,0 +1,34 @@ +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -1464,7 +1464,16 @@ void __cpuinit per_cpu_trap_init(void) + */ + if (cpu_has_mips_r2) { + cp0_compare_irq = (read_c0_intctl() >> 29) & 7; ++ if (!cp0_compare_irq) ++ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; ++ + cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7; ++ if (!cp0_perfcount_irq) ++ cp0_perfcount_irq = CP0_LEGACY_PERFCNT_IRQ; ++ ++ if (arch_fixup_c0_irqs) ++ arch_fixup_c0_irqs(); ++ + if (cp0_perfcount_irq == cp0_compare_irq) + cp0_perfcount_irq = -1; + } else { +--- a/include/asm-mips/irq.h ++++ b/include/asm-mips/irq.h +@@ -156,8 +156,12 @@ extern void free_irqno(unsigned int irq) + * IE7. Since R2 their number has to be read from the c0_intctl register. + */ + #define CP0_LEGACY_COMPARE_IRQ 7 ++#define CP0_LEGACY_PERFCNT_IRQ 7 + + extern int cp0_compare_irq; + extern int cp0_perfcount_irq; + ++extern void __weak arch_fixup_c0_irqs(void); ++ ++ + #endif /* _ASM_IRQ_H */ |