leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Linus Torvalds 2013-04-24 17:10:18 -07:00
commit 0fbd06761f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sparc/mm/tlb.c
View File

@ -87,7 +87,7 @@ static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,
if (!tb->active) { if (!tb->active) {
global_flush_tlb_page(mm, vaddr); global_flush_tlb_page(mm, vaddr);
flush_tsb_user_page(mm, vaddr); flush_tsb_user_page(mm, vaddr);
return; goto out;
} }
if (nr == 0) if (nr == 0)
@ -98,6 +98,7 @@ static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,
if (nr >= TLB_BATCH_NR) if (nr >= TLB_BATCH_NR)
flush_tlb_pending(); flush_tlb_pending();
out:
put_cpu_var(tlb_batch); put_cpu_var(tlb_batch);
} }