Merge branch 'master' into percpu

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h

2 files changed, 1 insertions, 24 deletions

diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c
index 087a2096f221..ed60588f8467 100644
--- a/arch/cris/arch-v10/mm/fault.c
+++ b/arch/cris/arch-v10/mm/fault.c
@@ -80,8 +80,7 @@ handle_mmu_bus_fault(struct pt_regs *regs)
          * do_page_fault may have flushed the TLB so we have to restore
          * the MMU registers.
          */
-        local_save_flags(flags);
-        local_irq_disable();
+        local_irq_save(flags);
         pmd = (pmd_t *)(pgd + pgd_index(address));
         if (pmd_none(*pmd))
                 goto exit;
diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c
index 4a496e4ffacc..21d78c599bab 100644
--- a/arch/cris/arch-v10/mm/tlb.c
+++ b/arch/cris/arch-v10/mm/tlb.c
@@ -134,28 +134,6 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
         local_irq_restore(flags);
 }
 
-/* dump the entire TLB for debug purposes */
-
-#if 0
-void
-dump_tlb_all(void)
-{
-        int i;
-        unsigned long flags;
-
-        printk("TLB dump. LO is: pfn | reserved | global | valid | kernel | we  |\n");
-
-        local_save_flags(flags);
-        local_irq_disable();
-        for(i = 0; i < NUM_TLB_ENTRIES; i++) {
-                *R_TLB_SELECT = ( IO_FIELD(R_TLB_SELECT, index, i) );
-                printk("Entry %d: HI 0x%08lx, LO 0x%08lx\n",
-                       i, *R_TLB_HI, *R_TLB_LO);
-        }
-        local_irq_restore(flags);
-}
-#endif
-
 /*
  * Initialize the context related info for a new mm_struct
  * instance.