From 585447dca29ad69e668c89555c1d5bf50ee46867 Mon Sep 17 00:00:00 2001
From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Date: Tue, 26 May 2009 10:33:35 -0700
Subject: [PATCH] --- yaml --- r: 145312 b: refs/heads/master c:
 2171787be2e71ff71159857bfeb21398b61eb615 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 092e7d4e8aba..8fd2882ada57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46176b4f6bac19454b7b5c35f68594b85850a600
+refs/heads/master: 2171787be2e71ff71159857bfeb21398b61eb615
diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c
index 0f9052bcec4b..e17efed088c5 100644
--- a/trunk/arch/x86/mm/pageattr.c
+++ b/trunk/arch/x86/mm/pageattr.c
@@ -204,30 +204,19 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache)
 	}
 }
 
-static void wbinvd_local(void *unused)
-{
-	wbinvd();
-}
-
 static void cpa_flush_array(unsigned long *start, int numpages, int cache,
 			    int in_flags, struct page **pages)
 {
 	unsigned int i, level;
+	unsigned long do_wbinvd = cache && numpages >= 1024; /* 4M threshold */
 
 	BUG_ON(irqs_disabled());
 
-	on_each_cpu(__cpa_flush_range, NULL, 1);
+	on_each_cpu(__cpa_flush_all, (void *) do_wbinvd, 1);
 
-	if (!cache)
+	if (!cache || do_wbinvd)
 		return;
 
-	/* 4M threshold */
-	if (numpages >= 1024) {
-		if (boot_cpu_data.x86 >= 4)
-			on_each_cpu(wbinvd_local, NULL, 1);
-
-		return;
-	}
 	/*
 	 * We only need to flush on one CPU,
 	 * clflush is a MESI-coherent instruction that