public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] 2.6.5-rc2: fix scsi_transport_spi.c with gcc 2.95
       [not found] <Pine.LNX.4.58.0403191937160.1106@ppc970.osdl.org>
@ 2004-03-20 12:18 ` Adrian Bunk
  2004-03-20 13:43   ` James Bottomley
  0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2004-03-20 12:18 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Kernel Mailing List, Andrew Morton, Martin Hicks, James.Bottomley,
	linux-scsi

I got the following compile error in 2.6.5-rc2 using gcc 2.95:

<--  snip  -->

...
  CC      drivers/scsi/scsi_transport_spi.o
drivers/scsi/scsi_transport_spi.c: In function `spi_dv_retrain':
drivers/scsi/scsi_transport_spi.c:388: parse error before `;'
drivers/scsi/scsi_transport_spi.c:392: parse error before `;'
drivers/scsi/scsi_transport_spi.c: In function `spi_dv_device_internal':
drivers/scsi/scsi_transport_spi.c:463: parse error before `;'
drivers/scsi/scsi_transport_spi.c:475: parse error before `;'
drivers/scsi/scsi_transport_spi.c:494: parse error before `;'
drivers/scsi/scsi_transport_spi.c: In function `spi_dv_device':
drivers/scsi/scsi_transport_spi.c:539: parse error before `;'
drivers/scsi/scsi_transport_spi.c:543: parse error before `;'
make[2]: *** [drivers/scsi/scsi_transport_spi.o] Error 1

<--  snip  -->


I found the patch below in -mm that fixes this problem.


Please apply
Adrian


<--  snip  -->


Work around the gcc-2.95 token pasting bug.


---

 25-akpm/drivers/scsi/scsi_transport_spi.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/scsi/scsi_transport_spi.c~scsi_transport_spi-build-fix drivers/scsi/scsi_transport_spi.c
--- 25/drivers/scsi/scsi_transport_spi.c~scsi_transport_spi-build-fix	2004-03-14 02:45:22.999909632 -0800
+++ 25-akpm/drivers/scsi/scsi_transport_spi.c	2004-03-14 02:45:29.938854752 -0800
@@ -33,7 +33,7 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
 
-#define SPI_PRINTK(x, l, f, a...)	printk(l "scsi(%d:%d:%d:%d): " f, (x)->host->host_no, (x)->channel, (x)->id, (x)->lun, ##a)
+#define SPI_PRINTK(x, l, f, a...)	printk(l "scsi(%d:%d:%d:%d): " f, (x)->host->host_no, (x)->channel, (x)->id, (x)->lun , ##a)
 
 static void transport_class_release(struct class_device *class_dev);
 

_

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch] 2.6.5-rc2: fix scsi_transport_spi.c with gcc 2.95
  2004-03-20 12:18 ` [patch] 2.6.5-rc2: fix scsi_transport_spi.c with gcc 2.95 Adrian Bunk
@ 2004-03-20 13:43   ` James Bottomley
  0 siblings, 0 replies; 2+ messages in thread
From: James Bottomley @ 2004-03-20 13:43 UTC (permalink / raw)
  To: Adrian Bunk
  Cc: Linus Torvalds, Kernel Mailing List, Andrew Morton, Martin Hicks,
	SCSI Mailing List

On Sat, 2004-03-20 at 07:18, Adrian Bunk wrote:
> I found the patch below in -mm that fixes this problem.

I already have the mm patch in scsi-misc-2.5.

Thanks,

James



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-03-20 13:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <Pine.LNX.4.58.0403191937160.1106@ppc970.osdl.org>
2004-03-20 12:18 ` [patch] 2.6.5-rc2: fix scsi_transport_spi.c with gcc 2.95 Adrian Bunk
2004-03-20 13:43   ` James Bottomley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox