Merge branch 'linus' into sched/core

Merge reason: merge the latest fixes, update to -rc4.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 28 deletions

diff --git a/arch/sh/mm/tlbflush_32.c b/arch/sh/mm/tlbflush_32.c
index 77dc5efa7127..3fbe03ce8fe3 100644
--- a/arch/sh/mm/tlbflush_32.c
+++ b/arch/sh/mm/tlbflush_32.c
@@ -119,31 +119,3 @@ void local_flush_tlb_mm(struct mm_struct *mm)
                 local_irq_restore(flags);
         }
 }
-
-void local_flush_tlb_all(void)
-{
-        unsigned long flags, status;
-        int i;
-
-        /*
-         * Flush all the TLB.
-         */
-        local_irq_save(flags);
-        jump_to_uncached();
-
-        status = __raw_readl(MMUCR);
-        status = ((status & MMUCR_URB) >> MMUCR_URB_SHIFT);
-
-        if (status == 0)
-                status = MMUCR_URB_NENTRIES;
-
-        for (i = 0; i < status; i++)
-                __raw_writel(0x0, MMU_UTLB_ADDRESS_ARRAY | (i << 8));
-
-        for (i = 0; i < 4; i++)
-                __raw_writel(0x0, MMU_ITLB_ADDRESS_ARRAY | (i << 8));
-
-        back_to_cached();
-        ctrl_barrier();
-        local_irq_restore(flags);
-}