The patch titled BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n has been added to the -mm tree. Its filename is block-hide-the-contents-of-linux-bioh-if-config_block=n.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n From: David Howells <dhowells@xxxxxxxxxx> Hide the contents of linux/bio.h if CONFIG_BLOCK=n as there shouldn't be compiled that uses it. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/bio.h | 3 +++ 1 files changed, 3 insertions(+) diff -puN include/linux/bio.h~block-hide-the-contents-of-linux-bioh-if-config_block=n include/linux/bio.h --- a/include/linux/bio.h~block-hide-the-contents-of-linux-bioh-if-config_block=n +++ a/include/linux/bio.h @@ -24,6 +24,8 @@ #include <linux/mempool.h> #include <linux/ioprio.h> +#ifdef CONFIG_BLOCK + /* Platforms may set this to teach the BIO layer about IOMMU hardware. */ #include <asm/io.h> @@ -361,4 +363,5 @@ static inline char *__bio_kmap_irq(struc __bio_kmap_irq((bio), (bio)->bi_idx, (flags)) #define bio_kunmap_irq(buf,flags) __bio_kunmap_irq(buf, flags) +#endif /* CONFIG_BLOCK */ #endif /* __LINUX_BIO_H */ _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are origin.patch frv-connect-up-fallocate.patch changing-include-asm-generic-pgtableh-for-non-mmu.patch nommu-present-backing-device-capabilities-for-mtd.patch nommu-add-support-for-direct-mapping-through-mtdconcat.patch block-hide-the-contents-of-linux-bioh-if-config_block=n.patch during-vm-oom-condition-kill-all-threads-in-process-group.patch remove-frv-usage-of-flush_tlb_pgtables.patch include-asm-frv-thread_infoh-kmalloc-memset-conversion-to-kzalloc.patch fs-afs-possible-cleanups.patch ecryptfs-add-key-list-structure-search-keyring.patch 64-bit-i_version-afs-fixes.patch mutex-subsystem-synchro-test-module.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