ibmvscsi compile error in 2.6.20-rc1

ibmvscsi compile error in 2.6.20-rc1

[Olaf Hering]

This happens when client and server are enabled.
And CONFIG_ISERIES is enabled too in my ppc64_defconfig.

  LD      drivers/scsi/ibmvscsi/ibmvscsic.o
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `ibmvscsi_reenable_crq_queue':
rpa_vscsi.c:(.opd+0x0): multiple definition of `ibmvscsi_reenable_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.opd+0x18): first defined here
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `.ibmvscsi_reenable_crq_queue':
rpa_vscsi.c:(.text+0x0): multiple definition of `.ibmvscsi_reenable_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.text+0x8): first defined here
ld: Warning: size of symbol `.ibmvscsi_reenable_crq_queue' changed from 8 in drivers/scsi/ibmvscsi/iseries_vscsi.o to 140 in drivers/scsi/ibmvscsi/rpa_vscsi.o
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `ibmvscsi_reset_crq_queue':
rpa_vscsi.c:(.opd+0x30): multiple definition of `ibmvscsi_reset_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.opd+0x0): first defined here
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `.ibmvscsi_reset_crq_queue':
rpa_vscsi.c:(.text+0x13c): multiple definition of `.ibmvscsi_reset_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.text+0x0): first defined here
ld: Warning: size of symbol `.ibmvscsi_reset_crq_queue' changed from 8 in drivers/scsi/ibmvscsi/iseries_vscsi.o to 236 in drivers/scsi/ibmvscsi/rpa_vscsi.o
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `ibmvscsi_send_crq':
rpa_vscsi.c:(.opd+0x78): multiple definition of `ibmvscsi_send_crq'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.opd+0x30): first defined here
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `.ibmvscsi_send_crq':
rpa_vscsi.c:(.text+0x348): multiple definition of `.ibmvscsi_send_crq'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.text+0x10): first defined here
ld: Warning: size of symbol `.ibmvscsi_send_crq' changed from 216 in drivers/scsi/ibmvscsi/iseries_vscsi.o to 68 in drivers/scsi/ibmvscsi/rpa_vscsi.o
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `ibmvscsi_init_crq_queue':
rpa_vscsi.c:(.opd+0xa8): multiple definition of `ibmvscsi_init_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.opd+0x60): first defined here
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `.ibmvscsi_init_crq_queue':
rpa_vscsi.c:(.text+0x440): multiple definition of `.ibmvscsi_init_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.text+0x140): first defined here
ld: Warning: size of symbol `.ibmvscsi_init_crq_queue' changed from 188 in drivers/scsi/ibmvscsi/iseries_vscsi.o to 728 in drivers/scsi/ibmvscsi/rpa_vscsi.o
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `ibmvscsi_release_crq_queue':
rpa_vscsi.c:(.opd+0xc0): multiple definition of `ibmvscsi_release_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.opd+0x48): first defined here
drivers/scsi/ibmvscsi/rpa_vscsi.o: In function `.ibmvscsi_release_crq_queue':
rpa_vscsi.c:(.text+0x718): multiple definition of `.ibmvscsi_release_crq_queue'
drivers/scsi/ibmvscsi/iseries_vscsi.o:iseries_vscsi.c:(.text+0xe8): first defined here
ld: Warning: size of symbol `.ibmvscsi_release_crq_queue' changed from 88 in drivers/scsi/ibmvscsi/iseries_vscsi.o to 236 in drivers/scsi/ibmvscsi/rpa_vscsi.o
make[4]: *** [drivers/scsi/ibmvscsi/ibmvscsic.o] Error 1

Re: ibmvscsi compile error in 2.6.20-rc1

[Stephen Rothwell]

On Sun, 10 Dec 2006 12:48:03 +0100 (MET) Olaf Hering <olaf@aepfle.de> wrote:
>
> This happens when client and server are enabled.
> And CONFIG_ISERIES is enabled too in my ppc64_defconfig.

Known problem.  There is a patch available.  I am hoping Paulus will put
it in soon ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --git a/drivers/scsi/ibmvscsi/Makefile b/drivers/scsi/ibmvscsi/Makefile
index 4e247b6..6661d74 100644
--- a/drivers/scsi/ibmvscsi/Makefile
+++ b/drivers/scsi/ibmvscsi/Makefile
@@ -1,5 +1,7 @@
 obj-$(CONFIG_SCSI_IBMVSCSI)	+= ibmvscsic.o
 
 ibmvscsic-y			+= ibmvscsi.o
+ifneq ($(CONFIG_PPC_PSERIES),y)
 ibmvscsic-$(CONFIG_PPC_ISERIES)	+= iseries_vscsi.o 
+endif
 ibmvscsic-$(CONFIG_PPC_PSERIES)	+= rpa_vscsi.o