Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

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

kernel os linux

Pull sparc fix from David Miller:
"Brown paper bag fix for sparc64"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix missing put_cpu_var() in tlb_batch_add_one() when not batching.

Linus Torvalds 13 years ago 0fbd0676 3c71d03a

+2 -1

1 changed file

expand all

arch

sparc

tlb.c

+2 -1

arch/sparc/mm/tlb.c

··· 87 87 if (!tb->active) { 88 88 global_flush_tlb_page(mm, vaddr); 89 89 flush_tsb_user_page(mm, vaddr); 90 - return; 90 + goto out; 91 91 } 92 92 93 93 if (nr == 0) ··· 98 98 if (nr >= TLB_BATCH_NR) 99 99 flush_tlb_pending(); 100 100 101 + out: 101 102 put_cpu_var(tlb_batch); 102 103 } 103 104

Configure Feed

Configure Feed