From 627c4a44d7ebfa2b73cf41e1deb7f541ddda6378 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Tue, 4 Nov 2008 13:53:04 -0800
Subject: [PATCH] --- yaml --- r: 118534 b: refs/heads/master c:
 d6f0f39b7d05e62b347c4352d070e4afb3ade4b5 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/tlb_32.c | 6 ++++++
 trunk/arch/x86/kernel/tlb_64.c | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 29570eb1cd22..d3512fb18964 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db282fa67b58daff8a57f9e1c93d4474b5908ff
+refs/heads/master: d6f0f39b7d05e62b347c4352d070e4afb3ade4b5
diff --git a/trunk/arch/x86/kernel/tlb_32.c b/trunk/arch/x86/kernel/tlb_32.c
index e00534b33534..f4049f3513b6 100644
--- a/trunk/arch/x86/kernel/tlb_32.c
+++ b/trunk/arch/x86/kernel/tlb_32.c
@@ -154,6 +154,12 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,
 	flush_mm = mm;
 	flush_va = va;
 	cpus_or(flush_cpumask, cpumask, flush_cpumask);
+
+	/*
+	 * Make the above memory operations globally visible before
+	 * sending the IPI.
+	 */
+	smp_mb();
 	/*
 	 * We have to send the IPI only to
 	 * CPUs affected.
diff --git a/trunk/arch/x86/kernel/tlb_64.c b/trunk/arch/x86/kernel/tlb_64.c
index dcbf7a1159ea..8f919ca69494 100644
--- a/trunk/arch/x86/kernel/tlb_64.c
+++ b/trunk/arch/x86/kernel/tlb_64.c
@@ -182,6 +182,11 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,
 	f->flush_va = va;
 	cpus_or(f->flush_cpumask, cpumask, f->flush_cpumask);
 
+	/*
+	 * Make the above memory operations globally visible before
+	 * sending the IPI.
+	 */
+	smp_mb();
 	/*
 	 * We have to send the IPI only to
 	 * CPUs affected.