The patch titled include/linux/dma-mapping.h: remove DMA_xxBIT_MASK macros has been added to the -mm tree. Its filename is include-linux-dma-mappingh-remove-dma_xxbit_mask-macros.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: include/linux/dma-mapping.h: remove DMA_xxBIT_MASK macros From: WANG Cong <xiyou.wangcong@xxxxxxxxx> git grep shows there are no users in tree, so we can remove them safely. Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx> Acked-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Acked-by: Jiri Slaby <jslaby@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/feature-removal-schedule.txt | 7 ------ include/linux/dma-mapping.h | 21 ------------------- 2 files changed, 28 deletions(-) diff -puN Documentation/feature-removal-schedule.txt~include-linux-dma-mappingh-remove-dma_xxbit_mask-macros Documentation/feature-removal-schedule.txt --- a/Documentation/feature-removal-schedule.txt~include-linux-dma-mappingh-remove-dma_xxbit_mask-macros +++ a/Documentation/feature-removal-schedule.txt @@ -474,13 +474,6 @@ Who: FUJITA Tomonori <fujita.tomonori@la ---------------------------- -What: DMA_xxBIT_MASK macros -When: Jun 2011 -Why: DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros. -Who: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> - ----------------------------- - What: iwlwifi disable_hw_scan module parameters When: 2.6.40 Why: Hareware scan is the prefer method for iwlwifi devices for diff -puN include/linux/dma-mapping.h~include-linux-dma-mappingh-remove-dma_xxbit_mask-macros include/linux/dma-mapping.h --- a/include/linux/dma-mapping.h~include-linux-dma-mappingh-remove-dma_xxbit_mask-macros +++ a/include/linux/dma-mapping.h @@ -54,27 +54,6 @@ struct dma_map_ops { #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -typedef u64 DMA_nnBIT_MASK __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_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 static inline int valid_dma_direction(int dma_direction) _ Patches currently in -mm which might be from xiyou.wangcong@xxxxxxxxx are origin.patch linux-next.patch cris-fix-a-build-error-in-kernel-forkc.patch cris-fix-a-build-error-in-kernel-forkc-checkpatch-fixes.patch cris-fix-a-build-error-in-sync_serial_open.patch cris-fix-the-prototype-of-sync_serial_ioctl.patch cris-add-missing-declaration-of-kgdb_init-and-breakpoint.patch mm-remove-the-leftovers-of-noswapaccount.patch cris-fix-some-build-warnings-in-pinmuxc.patch include-linux-dma-mappingh-remove-dma_xxbit_mask-macros.patch kexec-remove-kmsg_dump_kexec.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