On Thu, 31 May 2007 15:10:05 -0700, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > Cornelia, afaict your patch has no actual delendency upon Dan's > dma-mapping-prevent-dma-dependent-code-from-linking-on.patch, correct? If > so, I can merge it via James and then merge Dan's patch once James has > merged. AFAICS there's no dependency in that direction. > diff -puN include/scsi/scsi_cmnd.h~scsi-dont-build-scsi_dma_mapunmap-for-has_dma include/scsi/scsi_cmnd.h > --- a/include/scsi/scsi_cmnd.h~scsi-dont-build-scsi_dma_mapunmap-for-has_dma > +++ a/include/scsi/scsi_cmnd.h > @@ -135,8 +135,10 @@ extern void scsi_kunmap_atomic_sg(void * > extern struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *, gfp_t); > extern void scsi_free_sgtable(struct scatterlist *, int); > > +#ifdef CONFIG_SCSI_DMA > extern int scsi_dma_map(struct scsi_cmnd *cmd); > extern void scsi_dma_unmap(struct scsi_cmnd *cmd); > +#endif > > #define scsi_sg_count(cmd) ((cmd)->use_sg) > #define scsi_sglist(cmd) ((struct scatterlist *)(cmd)->request_buffer) > > We don't really need the ifdefs here. If someone incorrectly calls these > functions then they'll get a link-time failure anyway. The downside of > removing these ifdefs is that they won't get a compile-time warning, but I > tend to think that this small cost is worth it. OK, fine with me. - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
