UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Linus Torvalds 2007-01-22 09:07:00 -08:00
parent 79d2628702 2806ccd7ad
commit e45521a8d4
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/kernel/smtc.c
View File

@ -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,

1
arch/mips/mm/tlb-r4k.c
View File

@ -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);