public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@fs.tum.de>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@osdl.org>,
	Martin Hicks <mort@wildopensource.com>,
	James.Bottomley@SteelEye.com, linux-scsi@vger.kernel.org
Subject: [patch] 2.6.5-rc2: fix scsi_transport_spi.c with gcc 2.95
Date: Sat, 20 Mar 2004 13:18:54 +0100	[thread overview]
Message-ID: <20040320121853.GF19464@fs.tum.de> (raw)
In-Reply-To: <Pine.LNX.4.58.0403191937160.1106@ppc970.osdl.org>

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);
 

_

  parent reply	other threads:[~2004-03-20 12:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-20  3:39 Linux 2.6.5-rc2 Linus Torvalds
2004-03-20 10:21 ` Linux 2.6.5-rc2, hotplug and ohci-hcd issue Prakash K. Cheemplavam
2004-03-20 10:32   ` Prakash K. Cheemplavam
2004-03-20 13:23   ` Zilvinas Valinskas
2004-03-20 19:12     ` Prakash K. Cheemplavam
2004-03-20 22:38       ` Prakash K. Cheemplavam
2004-03-22  8:32         ` Zilvinas Valinskas
2004-03-24 19:24           ` Prakash K. Cheemplavam
2004-03-20 12:18 ` Adrian Bunk [this message]
2004-03-20 13:43   ` [patch] 2.6.5-rc2: fix scsi_transport_spi.c with gcc 2.95 James Bottomley
2004-03-21 20:21 ` Linux 2.6.5-rc2 (compile stats) John Cherry
2004-03-22 21:38   ` Jos Hulzink

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040320121853.GF19464@fs.tum.de \
    --to=bunk@fs.tum.de \
    --cc=James.Bottomley@SteelEye.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mort@wildopensource.com \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox