Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra

[sfrench/cifs-2.6.git] / arch / x86 / mm / tlb.c

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 426f3a1a64d3d73efa7a4aaea70cba37a8c5f9d3..c03f14ab666742d6960ff3339ebcfe28a003308b 100644 (file)
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -278,11 +278,9 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
 
 static void do_flush_tlb_all(void *info)
 {
-       unsigned long cpu = smp_processor_id();
-
        __flush_tlb_all();
        if (percpu_read(cpu_tlbstate.state) == TLBSTATE_LAZY)
-               leave_mm(cpu);
+               leave_mm(smp_processor_id());
 }
 
 void flush_tlb_all(void)