From fb2fb051736a1086e3e360f2ee89e5813185db67 Mon Sep 17 00:00:00 2001
From: Cliff Wickman <cpw@sgi.com>
Date: Thu, 29 Jan 2009 15:35:26 -0600
Subject: [PATCH] --- yaml --- r: 136707 b: refs/heads/master c:
 2749ebe320ff9f77548d10fcc0a3464ac21c8e58 h: refs/heads/master i:   136705:
 ba39975bd69dad2b818f216d38024c848db74fb7   136703:
 6080cf078f341bbc96c71b0772f633b7759274ef v: v3

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

diff --git a/[refs] b/[refs]
index ff955c5775f5..ad88d20cd3e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ac6cffea4aa18007a454a7442da2855882f403d
+refs/heads/master: 2749ebe320ff9f77548d10fcc0a3464ac21c8e58
diff --git a/trunk/arch/x86/kernel/tlb_uv.c b/trunk/arch/x86/kernel/tlb_uv.c
index 89fce1b6d01f..f4b2f27d19b9 100644
--- a/trunk/arch/x86/kernel/tlb_uv.c
+++ b/trunk/arch/x86/kernel/tlb_uv.c
@@ -259,7 +259,7 @@ const struct cpumask *uv_flush_send_and_wait(int cpu, int this_blade,
 		 * the cpu's, all of which are still in the mask.
 		 */
 		__get_cpu_var(ptcstats).ptc_i++;
-		return 0;
+		return flush_mask;
 	}
 
 	/*