Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / include / linux / dma-mapping.h

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 29b028597dcd441ed3534b664f8b29c8efd295d1..101a2d4636befbd1248b7642c38a87ff77243f07 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -13,9 +13,15 @@ enum dma_data_direction {
        DMA_NONE = 3,
 };
 
-#define DMA_BIT_MASK(n)        ((1ULL<<(n))-1)
+#define DMA_BIT_MASK(n)        (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 
-#define DMA_64BIT_MASK (~0ULL)
+/*
+ * NOTE: do not use the below macros in new code and do not add new definitions
+ * here.
+ *
+ * Instead, just open-code DMA_BIT_MASK(n) within your driver
+ */
+#define DMA_64BIT_MASK DMA_BIT_MASK(64)
 #define DMA_48BIT_MASK DMA_BIT_MASK(48)
 #define DMA_47BIT_MASK DMA_BIT_MASK(47)
 #define DMA_40BIT_MASK DMA_BIT_MASK(40)