Merge tag 'byteswap-for-linus-20121219' of git://git.infradead.org/users/dwmw2/byteswap

[~andy/linux] / arch / x86 / include / asm / tlbflush.h

diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 74a44333545ab6fdf8a71b38c573ff78a37e6661..0fee48e279cc6659c059acfe1dbc8a42047603e4 100644 (file)
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -56,10 +56,7 @@ static inline void __flush_tlb_all(void)
 
 static inline void __flush_tlb_one(unsigned long addr)
 {
-       if (cpu_has_invlpg)
                __flush_tlb_single(addr);
-       else
-               __flush_tlb();
 }
 
 #define TLB_FLUSH_ALL  -1UL