From 53323aff1ff662bdfb3e03e2bb441cacc915e912 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Wed, 21 Jul 2010 14:47:05 +0200
Subject: [PATCH] --- yaml --- r: 205496 b: refs/heads/master c:
 3f8afb77cd8a672f024e4a16763ef177bc16c8f8 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/x86/mm/tlb.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 43d25d3175c6..dce05448358b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 468c30f2bbdf1ba0fbf16667eade23a46eaa8f06
+refs/heads/master: 3f8afb77cd8a672f024e4a16763ef177bc16c8f8
diff --git a/trunk/arch/x86/mm/tlb.c b/trunk/arch/x86/mm/tlb.c
index 426f3a1a64d3..c03f14ab6667 100644
--- a/trunk/arch/x86/mm/tlb.c
+++ b/trunk/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)