History

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

Linus Torvalds committed 14 years ago

Commit e5e77cf2 parents b3a297d e376fdf4 files · +9 −9Browse files

Unified · Split

4 files
  1. arch/mips/kernel/smp-cmp.c +1 −1
  2. arch/mips/mm/gup.c +2 −0
  3. arch/mips/mti-malta/malta-int.c +6 −3
  4. arch/mips/mti-malta/malta-platform.c +0 −5
arch/mips/kernel/smp-cmp.c+1−1
@@ -102,7 +102,7 @@ static void cmp_init_secondary(void) · 101 unmodified lines
102 c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE;102 c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE;
103#endif103#endif
104#ifdef CONFIG_MIPS_MT_SMTC104#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#endif106#endif
107}107}
108 108
arch/mips/mm/gup.c+2−0
@@ -152,6 +152,8 @@ static int gup_huge_pud(pud_t pud, unsigned long addr, unsigned long end, · 151 unmodified lines
152 do {152 do {
153 VM_BUG_ON(compound_head(page) != head);153 VM_BUG_ON(compound_head(page) != head);
154 pages[*nr] = page;154 pages[*nr] = page;
155 if (PageTail(page))
156 get_huge_page_tail(page);
155 (*nr)++;157 (*nr)++;
156 page++;158 page++;
157 refs++;159 refs++;
arch/mips/mti-malta/malta-int.c+6−3
@@ -273,16 +273,19 @@ asmlinkage void plat_irq_dispatch(void) · 272 unmodified lines
273 unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;273 unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
274 int irq;274 int irq;
275 275
276 if (unlikely(!pending)) {
277 spurious_interrupt();
278 return;
279 }
280
276 irq = irq_ffs(pending);281 irq = irq_ffs(pending);
277 282
278 if (irq == MIPSCPU_INT_I8259A)283 if (irq == MIPSCPU_INT_I8259A)
279 malta_hw0_irqdispatch();284 malta_hw0_irqdispatch();
280 else if (gic_present && ((1 << irq) & ipi_map[smp_processor_id()]))285 else if (gic_present && ((1 << irq) & ipi_map[smp_processor_id()]))
281 malta_ipi_irqdispatch();286 malta_ipi_irqdispatch();
282 else if (irq >= 0)
283 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
284 else287 else
285 spurious_interrupt();288 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
286}289}
287 290
288#ifdef CONFIG_MIPS_MT_SMP291#ifdef CONFIG_MIPS_MT_SMP
arch/mips/mti-malta/malta-platform.c+0−5
@@ -138,11 +138,6 @@ static int __init malta_add_devices(void) · 137 unmodified lines
138 if (err)138 if (err)
139 return err;139 return err;
140 140
141 /*
142 * Set RTC to BCD mode to support current alarm code.
143 */
144 CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL);
145
146 return 0;141 return 0;
147}142}
148 143

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t