diff --git a/[refs] b/[refs]
index f20fb3114dda..ddf12c0166ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d497cecdeae75351567d20b86d8a3a05e7f48ed
+refs/heads/master: b8112df71cae7d6a86158caeb19d215f56c4f9ab
diff --git a/trunk/include/linux/dma-mapping.h b/trunk/include/linux/dma-mapping.h
index 806c305332c1..2d80cc761a15 100644
--- a/trunk/include/linux/dma-mapping.h
+++ b/trunk/include/linux/dma-mapping.h
@@ -14,7 +14,12 @@ enum dma_data_direction {
 };
 
 #define DMA_64BIT_MASK	0xffffffffffffffffULL
+#define DMA_40BIT_MASK	0x000000ffffffffffULL
+#define DMA_39BIT_MASK	0x0000007fffffffffULL
 #define DMA_32BIT_MASK	0x00000000ffffffffULL
+#define DMA_31BIT_MASK	0x000000007fffffffULL
+#define DMA_30BIT_MASK	0x000000003fffffffULL
+#define DMA_29BIT_MASK	0x000000001fffffffULL
 
 #include <asm/dma-mapping.h>