| commit | c1ddb482044ca6bfe3de6d45ef17383f3d719ed7 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Tue Nov 20 16:49:15 2012 -0800 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Tue Nov 20 16:49:15 2012 -0800 |
| tree | ada9c458cd771755461f8d423cc917aefd64663b | |
| parent | ddd32b4289a6feda9ad9e68b0d85641c389a72ba [diff] | |
| parent | 0f905a43ce955b638139bd84486194770a6a2c08 [diff] |
Merge commit 'efi-for-3.7-v2' into x86/urgent
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 0777f04..60f926c 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c
@@ -197,7 +197,7 @@ } if (end == TLB_FLUSH_ALL || tlb_flushall_shift == -1 - || vmflag == VM_HUGETLB) { + || vmflag & VM_HUGETLB) { local_flush_tlb(); goto flush_all; }