commit e45521a8d44da2c4efd17fc8e853f7917e99b57a · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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.

Linus Torvalds 19 years ago e45521a8 79d26287

+1 -1

2 changed files

expand all

unified split

arch

mips

kernel

smtc.c

tlb-r4k.c

arch/mips/kernel/smtc.c

··· 261 } 262 } 263 write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB); 264 265 /* 266 * Setup kernel data structures to use software total,

··· 261 } 262 } 263 write_c0_mvpcontrol(read_c0_mvpcontrol() | MVPCONTROL_STLB); 264 + ehb(); 265 266 /* 267 * Setup kernel data structures to use software total,

-1

arch/mips/mm/tlb-r4k.c

··· 106 ENTER_CRITICAL(flags); 107 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; 108 size = (size + 1) >> 1; 109 - local_irq_save(flags); 110 if (size <= current_cpu_data.tlbsize/2) { 111 int oldpid = read_c0_entryhi(); 112 int newpid = cpu_asid(cpu, mm);

··· 106 ENTER_CRITICAL(flags); 107 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; 108 size = (size + 1) >> 1; 109 if (size <= current_cpu_data.tlbsize/2) { 110 int oldpid = read_c0_entryhi(); 111 int newpid = cpu_asid(cpu, mm);