Commit e45521a8 authored by Linus Torvalds's avatar Linus Torvalds

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] Delete duplicate call to load_irq_save.
  [MIPS] SMTC: Fix cp0 hazard.
parents 79d26287 2806ccd7
...@@ -261,6 +261,7 @@ void smtc_configure_tlb(void) ...@@ -261,6 +261,7 @@ void smtc_configure_tlb(void)
} }
} }
write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB); write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB);
ehb();
/* /*
* Setup kernel data structures to use software total, * Setup kernel data structures to use software total,
......
...@@ -106,7 +106,6 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, ...@@ -106,7 +106,6 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
ENTER_CRITICAL(flags); ENTER_CRITICAL(flags);
size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
size = (size + 1) >> 1; size = (size + 1) >> 1;
local_irq_save(flags);
if (size <= current_cpu_data.tlbsize/2) { if (size <= current_cpu_data.tlbsize/2) {
int oldpid = read_c0_entryhi(); int oldpid = read_c0_entryhi();
int newpid = cpu_asid(cpu, mm); int newpid = cpu_asid(cpu, mm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment