Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Random fixes across arch/mips, essentially.
One fix for an issue in get_user_pages_fast() which previously was
discovered on x86, a miscalculation in the support for the MIPS MT
hardware multithreading support, the RTC support for the Malta and a
fix for a spurious interrupt issue that seems to bite only very
special Malta configurations."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Malta: Don't crash on spurious interrupt.
MIPS: Malta: Remove RTC Data Mode bootstrap breakage
MIPS: mm: Add compound tail page _mapcount when mapped
MIPS: CMP/SMTC: Fix tc_id calculation
+9
-9
+1
-1
arch/mips/kernel/smp-cmp.c
+1
-1
arch/mips/kernel/smp-cmp.c
···
102
102
c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE;
103
103
#endif
104
104
#ifdef CONFIG_MIPS_MT_SMTC
105
-
c->tc_id = (read_c0_tcbind() >> TCBIND_CURTC_SHIFT) & TCBIND_CURTC;
105
+
c->tc_id = (read_c0_tcbind() & TCBIND_CURTC) >> TCBIND_CURTC_SHIFT;
106
106
#endif
107
107
}
108
108
+2
arch/mips/mm/gup.c
+2
arch/mips/mm/gup.c
+6
-3
arch/mips/mti-malta/malta-int.c
+6
-3
arch/mips/mti-malta/malta-int.c
···
273
273
unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
274
274
int irq;
275
275
276
+
if (unlikely(!pending)) {
277
+
spurious_interrupt();
278
+
return;
279
+
}
280
+
276
281
irq = irq_ffs(pending);
277
282
278
283
if (irq == MIPSCPU_INT_I8259A)
279
284
malta_hw0_irqdispatch();
280
285
else if (gic_present && ((1 << irq) & ipi_map[smp_processor_id()]))
281
286
malta_ipi_irqdispatch();
282
-
else if (irq >= 0)
283
-
do_IRQ(MIPS_CPU_IRQ_BASE + irq);
284
287
else
285
-
spurious_interrupt();
288
+
do_IRQ(MIPS_CPU_IRQ_BASE + irq);
286
289
}
287
290
288
291
#ifdef CONFIG_MIPS_MT_SMP