diff --git a/[refs] b/[refs]
index 8af67468a9f7..dae69e63942d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f655f5e956eaf4fcda983f3b3d37c76371556c27
+refs/heads/master: 621266bdf4b78fa92f7eabd7688b86f0dbd61d64
diff --git a/trunk/arch/sh/include/asm/dma-mapping.h b/trunk/arch/sh/include/asm/dma-mapping.h
index 87ced133a363..bea3337a426a 100644
--- a/trunk/arch/sh/include/asm/dma-mapping.h
+++ b/trunk/arch/sh/include/asm/dma-mapping.h
@@ -89,8 +89,6 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
 {
 	struct dma_map_ops *ops = get_dma_ops(dev);
 
-	WARN_ON(irqs_disabled());	/* for portability */
-
 	if (dma_release_from_coherent(dev, get_order(size), vaddr))
 		return;