The patch titled Use BUG_ON(foo) instead of "if (foo) BUG()" in include/asm-i386/dma-mapping.h has been removed from the -mm tree. Its filename is use-bug_onfoo-instead-of-if-foo-bug-in-include-asm-i386-dma-mappingh.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Use BUG_ON(foo) instead of "if (foo) BUG()" in include/asm-i386/dma-mapping.h From: Rolf Eike Beer <eike-kernel@xxxxxxxxx> Signed-off-by: Rolf Eike Beer <eike-kernel@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-i386/dma-mapping.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN include/asm-i386/dma-mapping.h~use-bug_onfoo-instead-of-if-foo-bug-in-include-asm-i386-dma-mappingh include/asm-i386/dma-mapping.h --- a/include/asm-i386/dma-mapping.h~use-bug_onfoo-instead-of-if-foo-bug-in-include-asm-i386-dma-mappingh +++ a/include/asm-i386/dma-mapping.h @@ -21,8 +21,7 @@ static inline dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, enum dma_data_direction direction) { - if (direction == DMA_NONE) - BUG(); + BUG_ON(direction == DMA_NONE); WARN_ON(size == 0); flush_write_buffers(); return virt_to_phys(ptr); @@ -32,8 +31,7 @@ static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction direction) { - if (direction == DMA_NONE) - BUG(); + BUG_ON(direction == DMA_NONE); } static inline int @@ -42,8 +40,7 @@ dma_map_sg(struct device *dev, struct sc { int i; - if (direction == DMA_NONE) - BUG(); + BUG_ON(direction == DMA_NONE); WARN_ON(nents == 0 || sg[0].length == 0); for (i = 0; i < nents; i++ ) { _ Patches currently in -mm which might be from eike-kernel@xxxxxxxxx are origin.patch remove-extra-newline-from-info-message.patch fix-scsi-scsi_transporth-compile-error.patch fix-kerneldoc-comments-in-mm-vmallocc.patch mark-__remove_vm_area-static.patch include-documentation-for-functions-in-drivers-base-classc.patch fix-parameter-names-in-drivers-base-classc.patch fix-kerneldoc-comments-in-kernel-timerc.patch fix-kerneldoc-comments-in-kernel-timerc-fix.patch move-valid_dma_direction-from-x86_64-to-generic-code.patch move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch use-valid_dma_direction-in-include-asm-i386-dma-mappingh.patch cdev-documentation-was-drop-second-arg-of-unregister_chrdev.patch return-better-error-codes-if-drivers-char-rawc-module-init-fails.patch remove-superfluous-call-to-call-to-cdev_del.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