diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:07:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:07:00 -0800 |
| commit | e45521a8d44da2c4efd17fc8e853f7917e99b57a (patch) | |
| tree | 71c95c906588e182b82a1ef45ca8dad3fc1a29f6 | |
| parent | Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| parent | [MIPS] Delete duplicate call to load_irq_save. (diff) | |
| download | linux-dev-e45521a8d44da2c4efd17fc8e853f7917e99b57a.tar.xz linux-dev-e45521a8d44da2c4efd17fc8e853f7917e99b57a.zip | |
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.
| -rw-r--r-- | arch/mips/kernel/smtc.c | 1 | ||||
| -rw-r--r-- | arch/mips/mm/tlb-r4k.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 802febed7df5..a8b387197d5b 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -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, diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c index 2e0e21ef433e..65160d4984d9 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c @@ -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); |