From 88257da9e95ecb4815ae66ef25f60fbb2df4dd65 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Tue, 20 Nov 2012 16:49:15 -0800
Subject: [PATCH] --- yaml --- r: 336003 b: refs/heads/master c:
 c1ddb482044ca6bfe3de6d45ef17383f3d719ed7 h: refs/heads/master i:   336001:
 7b140a7756860f3a239ccdc75b395f4516e2f835   335999:
 7aaa5b18784af4adfba7a7bfce0df39b0dbda989 v: v3

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

diff --git a/[refs] b/[refs]
index 50c6dd11da87..62fd94efd41c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f905a43ce955b638139bd84486194770a6a2c08
+refs/heads/master: c1ddb482044ca6bfe3de6d45ef17383f3d719ed7
diff --git a/trunk/arch/x86/mm/tlb.c b/trunk/arch/x86/mm/tlb.c
index 0777f042e400..60f926cd8b0e 100644
--- a/trunk/arch/x86/mm/tlb.c
+++ b/trunk/arch/x86/mm/tlb.c
@@ -197,7 +197,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
 	}
 
 	if (end == TLB_FLUSH_ALL || tlb_flushall_shift == -1
-					|| vmflag == VM_HUGETLB) {
+					|| vmflag & VM_HUGETLB) {
 		local_flush_tlb();
 		goto flush_all;
 	}