diff --git a/[refs] b/[refs]
index aa13591e95df..e3cbfeac338d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccea34b5d0fbab081496d1860f31acee99fa8a6d
+refs/heads/master: 3a450de1365d20afde406f0d9b2931a5e4a4fd6a
diff --git a/trunk/arch/x86/kernel/tlb_uv.c b/trunk/arch/x86/kernel/tlb_uv.c
index f04549afcfe9..d038b9c45cf8 100644
--- a/trunk/arch/x86/kernel/tlb_uv.c
+++ b/trunk/arch/x86/kernel/tlb_uv.c
@@ -314,8 +314,6 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
 	int locals = 0;
 	struct bau_desc *bau_desc;
 
-	WARN_ON(!in_atomic());
-
 	cpumask_andnot(flush_mask, cpumask, cpumask_of(cpu));
 
 	uv_cpu = uv_blade_processor_id();