diff --git a/[refs] b/[refs]
index b94c56b292d7..9dcf34903fbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35b16a9a093757a7a1ef288eea1128b0b4a3eef7
+refs/heads/master: 382cb5b91747f4f4d1f9883a39deec1b3d7fb906
diff --git a/trunk/arch/xtensa/mm/tlb.c b/trunk/arch/xtensa/mm/tlb.c
index e2700b21395b..070fb7a25231 100644
--- a/trunk/arch/xtensa/mm/tlb.c
+++ b/trunk/arch/xtensa/mm/tlb.c
@@ -63,7 +63,7 @@ void flush_tlb_all (void)
 void flush_tlb_mm(struct mm_struct *mm)
 {
 	if (mm == current->active_mm) {
-		int flags;
+		unsigned long flags;
 		local_save_flags(flags);
 		__get_new_mmu_context(mm);
 		__load_mmu_context(mm);