The patch titled
dma-mapping: mark DMA_nBITS_MASK as deprecated fix
has been removed from the -mm tree. Its filename was
dma-mapping-mark-dma_nbits_mask-as-deprecated-fix.patch
This patch was dropped because it was folded into dma-mapping-mark-dma_nbits_mask-as-deprecated.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: dma-mapping: mark DMA_nBITS_MASK as deprecated fix
From: Jiri Slaby <jirislaby@xxxxxxxxx>
As Fujita correctly demurs, use more meaningful typedef name, so that we
now see:
warning: DMA_nnBIT_MASK is deprecated
instead of
warning: DMA_DEPRECATED is deprecated
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Yang Hongyang <yanghy@xxxxxxxxxxxxxx>
Acked-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/dma-mapping.h | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff -puN include/linux/dma-mapping.h~dma-mapping-mark-dma_nbits_mask-as-deprecated-fix include/linux/dma-mapping.h
--- a/include/linux/dma-mapping.h~dma-mapping-mark-dma_nbits_mask-as-deprecated-fix
+++ a/include/linux/dma-mapping.h
@@ -63,7 +63,7 @@ struct dma_map_ops {
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-typedef u64 DMA_DEPRECATED __deprecated;
+typedef u64 DMA_nnBIT_MASK __deprecated;
/*
* NOTE: do not use the below macros in new code and do not add new definitions
@@ -71,18 +71,18 @@ typedef u64 DMA_DEPRECATED __deprecated;
*
* Instead, just open-code DMA_BIT_MASK(n) within your driver
*/
-#define DMA_64BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(64)
-#define DMA_48BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(48)
-#define DMA_47BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(47)
-#define DMA_40BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(40)
-#define DMA_39BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(39)
-#define DMA_35BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(35)
-#define DMA_32BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(32)
-#define DMA_31BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(31)
-#define DMA_30BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(30)
-#define DMA_29BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(29)
-#define DMA_28BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(28)
-#define DMA_24BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(24)
+#define DMA_64BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(64)
+#define DMA_48BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(48)
+#define DMA_47BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(47)
+#define DMA_40BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(40)
+#define DMA_39BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(39)
+#define DMA_35BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(35)
+#define DMA_32BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(32)
+#define DMA_31BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(31)
+#define DMA_30BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(30)
+#define DMA_29BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(29)
+#define DMA_28BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(28)
+#define DMA_24BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(24)
#define DMA_MASK_NONE 0x0ULL
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
origin.patch
char-moxa-prevent-opening-unavailable-ports.patch
dma-mapping-mark-dma_nbits_mask-as-deprecated.patch
dma-mapping-mark-dma_nbits_mask-as-deprecated-fix.patch
maintainers-fix-atheros-pattern-paths.patch
linux-next.patch
icom-converting-space-to-tabs.patch
rapidio-fix-kerneldoc-for-rio_mem_ops.patch
reiser4.patch
shrink_slab-handle-bad-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
