From 21ffc21629855c07420f71d06cb315026db9dd16 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Tue, 15 Mar 2011 09:57:37 +0800
Subject: [PATCH] --- yaml --- r: 234903 b: refs/heads/master c:
 25542c646afbf14c43fa7d2b443055cadb73b07a h: refs/heads/master i:   234901:
 c1c1703c42a44058cb2a78d3b3da6497147e86a1   234899:
 edb1b3c2e1f999864467ef31ec4632fb5508529b   234895:
 29063e00d63dde6137698613832b9e29de304210 v: v3

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

diff --git a/[refs] b/[refs]
index 05fb1c0532d1..1cc8bd85ee0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8460b3e5bc64955aeefdd8357b3bf7b5ff79b3f2
+refs/heads/master: 25542c646afbf14c43fa7d2b443055cadb73b07a
diff --git a/trunk/arch/x86/mm/tlb.c b/trunk/arch/x86/mm/tlb.c
index 55272d7c3b0b..d6c0418c3e47 100644
--- a/trunk/arch/x86/mm/tlb.c
+++ b/trunk/arch/x86/mm/tlb.c
@@ -208,11 +208,10 @@ void native_flush_tlb_others(const struct cpumask *cpumask,
 	if (is_uv_system()) {
 		unsigned int cpu;
 
-		cpu = get_cpu();
+		cpu = smp_processor_id();
 		cpumask = uv_flush_tlb_others(cpumask, mm, va, cpu);
 		if (cpumask)
 			flush_tlb_others_ipi(cpumask, mm, va);
-		put_cpu();
 		return;
 	}
 	flush_tlb_others_ipi(cpumask, mm, va);