> -----Original Message----- > From: Hannes Reinecke [mailto:hare@xxxxxxx] > Sent: Thursday, 06 November, 2014 2:31 AM > To: James Bottomley > Cc: Christoph Hellwig; Ewan Milne; Elliott, Robert (Server Storage); > linux-scsi@xxxxxxxxxxxxxxx; Hannes Reinecke > Subject: [PATCH 09/10] scsi: Conditionally compile in constants.c > > Instead of having constants.c littered with ifdef statements > we should be moving dummy functions into the header and > condintionally compile in constants.c if selected. > > Suggested-by: Christoph Hellwig <hch@xxxxxxxxxxxxx> > Reviewed-by: Christoph Hellwig <hch@xxxxxx> > Signed-off-by: Hannes Reinecke <hare@xxxxxxx> > --- > drivers/scsi/Makefile | 4 +-- > drivers/scsi/constants.c | 42 ---------------------------- > drivers/xen/xen-scsiback.c | 1 + > include/scsi/scsi_dbg.h | 68 > +++++++++++++++++++++++++++++++++++++++++++--- > 4 files changed, 67 insertions(+), 48 deletions(-) > > diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile > index 4991b62..76f8932 100644 > --- a/drivers/scsi/Makefile > +++ b/drivers/scsi/Makefile > @@ -158,9 +158,9 @@ obj-$(CONFIG_SCSI_OSD_INITIATOR) += osd/ > > # This goes last, so that "real" scsi devices probe earlier > obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o > - > -scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \ > +scsi_mod-y += scsi.o hosts.o scsi_ioctl.o \ > scsicam.o scsi_error.o scsi_lib.o > +scsi_mod-$(CONFIG_SCSI_CONSTANTS) += constants.o > scsi_mod-$(CONFIG_SCSI_DMA) += scsi_lib_dma.o > scsi_mod-y += scsi_scan.o scsi_sysfs.o scsi_devinfo.o > scsi_mod-$(CONFIG_SCSI_NETLINK) += scsi_netlink.o ... I has no compile issues with and without CONFIG_SCSI_CONSTANTS. make menuconfig says SCSI_CONSTANTS causes "(kernel size +=12K)". That appears low now (although other config settings might be exaggerating that on my machine). Without CONFIG_SCSI_CONSTANTS: -rwxrwxr-x 1 relliott relliott 133057434 Nov 14 16:27 vmlinux -rw-rw-r-- 1 relliott relliott 313306350 Nov 14 16:27 vmlinux.o With CONFIG_SCSI_CONSTANTS: -rwxrwxr-x 1 relliott relliott 133132674 Nov 14 16:33 vmlinux -rw-rw-r-- 1 relliott relliott 313575486 Nov 14 16:33 vmlinux.o vmlinux is 75,240 bytes different. So, you might want to modify the Kconfig description. Reviewed-by: Robert Elliott <elliott@xxxxxx> --- Rob Elliott HP Server Storage -- 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
