The patch titled dma-mapping: mark DMA_nBITS_MASK as deprecated has been added to the -mm tree. Its filename is dma-mapping-mark-dma_nbits_mask-as-deprecated.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: dma-mapping: mark DMA_nBITS_MASK as deprecated From: Jiri Slaby <jirislaby@xxxxxxxxx> Mark them deprecated so that out-of-tree developers get notified about thsi before their modules break when these macros are removed. Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx> Cc: Yang Hongyang <yanghy@xxxxxxxxxxxxxx> Cc: 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, 14 insertions(+), 12 deletions(-) diff -puN include/linux/dma-mapping.h~dma-mapping-mark-dma_nbits_mask-as-deprecated include/linux/dma-mapping.h --- a/include/linux/dma-mapping.h~dma-mapping-mark-dma_nbits_mask-as-deprecated +++ a/include/linux/dma-mapping.h @@ -63,24 +63,26 @@ struct dma_map_ops { #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) +typedef u64 DMA_DEPRECATED __deprecated; + /* * 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) -#define DMA_39BIT_MASK DMA_BIT_MASK(39) -#define DMA_35BIT_MASK DMA_BIT_MASK(35) -#define DMA_32BIT_MASK DMA_BIT_MASK(32) -#define DMA_31BIT_MASK DMA_BIT_MASK(31) -#define DMA_30BIT_MASK DMA_BIT_MASK(30) -#define DMA_29BIT_MASK DMA_BIT_MASK(29) -#define DMA_28BIT_MASK DMA_BIT_MASK(28) -#define DMA_24BIT_MASK DMA_BIT_MASK(24) +#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_MASK_NONE 0x0ULL _ Patches currently in -mm which might be from jirislaby@xxxxxxxxx are linux-next.patch dma-mapping-mark-dma_nbits_mask-as-deprecated.patch icom-converting-space-to-tabs.patch char-isicom-fix-build-warning.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