Commit 0d262424 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Disable preemption during flush_tlb_pending().
  [SPARC64]: Kill __flush_tlb_page() prototype.
parents 9f29333d c9f2946f

arch/sparc64/mm/tlb.c

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/percpu.h>

#include <linux/mm.h>

#include <linux/swap.h>

#include <linux/preempt.h>



#include <asm/pgtable.h>

#include <asm/pgalloc.h>
@@ -24,6 +25,8 @@ void flush_tlb_pending(void) 
{

	struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);



	preempt_disable();



	if (mp->tlb_nr) {

		flush_tsb_user(mp);
@@ -38,6 +41,8 @@ void flush_tlb_pending(void) 
		}

		mp->tlb_nr = 0;

	}



	preempt_enable();

}



void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig)

include/asm-sparc64/tlbflush.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ extern void flush_tlb_pending(void); 
/* Local cpu only.  */

extern void __flush_tlb_all(void);



extern void __flush_tlb_page(unsigned long context, unsigned long page, unsigned long r);



extern void __flush_tlb_kernel_range(unsigned long start, unsigned long end);



#ifndef CONFIG_SMP