Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[deliverable/linux.git] / arch / s390 / include / asm / tlbflush.h

diff --git a/arch/s390/include/asm/tlbflush.h b/arch/s390/include/asm/tlbflush.h
index 16c9c88658c81c48607de81e565fbe091f285e93..ca148f7c3eaae0d5c7f5483aef08f26af1bc9ca0 100644 (file)
--- a/arch/s390/include/asm/tlbflush.h
+++ b/arch/s390/include/asm/tlbflush.h
@@ -49,13 +49,6 @@ static inline void __tlb_flush_global(void)
        register unsigned long reg4 asm("4");
        long dummy;
 
-#ifndef CONFIG_64BIT
-       if (!MACHINE_HAS_CSP) {
-               smp_ptlb_all();
-               return;
-       }
-#endif /* CONFIG_64BIT */
-
        dummy = 0;
        reg2 = reg3 = 0;
        reg4 = ((unsigned long) &dummy) + 1;