diff --git a/[refs] b/[refs]
index 69c9a895b612..b91098abda49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddd32b4289a6feda9ad9e68b0d85641c389a72ba
+refs/heads/master: caaa8c6339ccefee6e834c4a8b0bec7e721e7357
diff --git a/trunk/arch/x86/boot/header.S b/trunk/arch/x86/boot/header.S
index 2a017441b8b2..8c132a625b94 100644
--- a/trunk/arch/x86/boot/header.S
+++ b/trunk/arch/x86/boot/header.S
@@ -476,6 +476,3 @@ die:
 setup_corrupt:
 	.byte	7
 	.string	"No setup signature found...\n"
-
-	.data
-dummy:	.long	0
diff --git a/trunk/arch/x86/mm/tlb.c b/trunk/arch/x86/mm/tlb.c
index 60f926cd8b0e..0777f042e400 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;
 	}