Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e45521a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/mips/kernel/smtc.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

arch/mips/mm/tlb-r4k.c

+0 −1
Original line number Diff line number Diff line
@@ -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);