Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
Linus Torvalds committed Jan 22, 2007
2 parents 79d2628 + 2806ccd commit e45521a
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions arch/mips/kernel/smtc.c
Original file line number Diff line number Diff line change
@@ -261,6 +261,7 @@ void smtc_configure_tlb(void)
}
}
write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB);
ehb();

/*
* Setup kernel data structures to use software total,
1 change: 0 additions & 1 deletion arch/mips/mm/tlb-r4k.c
Original file line number Diff line number Diff line change
@@ -106,7 +106,6 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
ENTER_CRITICAL(flags);
size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
size = (size + 1) >> 1;
local_irq_save(flags);
if (size <= current_cpu_data.tlbsize/2) {
int oldpid = read_c0_entryhi();
int newpid = cpu_asid(cpu, mm);

0 comments on commit e45521a

Please sign in to comment.