From: Adrian Bunk <bunk@fs.tum.de>
To: Marcelo Tosatti <marcelo@conectiva.com.br>
Cc: lkml <linux-kernel@vger.kernel.org>, Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: [2.4 patch] some gcc 3.3 fixes from -ac
Date: Fri, 27 Jun 2003 19:58:53 +0200 [thread overview]
Message-ID: <20030627175853.GJ24661@fs.tum.de> (raw)
In-Reply-To: <Pine.LNX.4.55L.0306261858460.10651@freak.distro.conectiva>
Hi Marcelo,
the patch below contains four trivial fixes for compile failures with
gcc 3.3 stolen from -ac.
I've tested the compilation with 2.4.22-pre2.
diffstat output:
drivers/net/irda/ma600.c | 6 +++---
drivers/net/wan/sdla_chdlc.c | 3 +--
drivers/sound/cs46xx.c | 4 ++--
net/decnet/dn_table.c | 3 +--
4 files changed, 7 insertions(+), 9 deletions(-)
Please apply
Adrian
--- linux.vanilla/drivers/net/irda/ma600.c 2002-11-29 21:27:18.000000000 +0000
+++ linux.21-ac3/drivers/net/irda/ma600.c 2003-05-29 01:40:07.000000000 +0100
@@ -51,9 +51,9 @@
#undef ASSERT(expr, func)
#define ASSERT(expr, func) \
if(!(expr)) { \
- printk( "Assertion failed! %s,%s,%s,line=%d\n",\
- #expr,__FILE__,__FUNCTION__,__LINE__); \
- ##func}
+ printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+ #expr,__FILE__,__FUNCTION__,__LINE__); \
+ func}
#endif
/* convert hex value to ascii hex */
--- linux.vanilla/drivers/net/wan/sdla_chdlc.c 2002-11-29 21:27:18.000000000 +0000
+++ linux.21-ac3/drivers/net/wan/sdla_chdlc.c 2003-05-28 15:35:56.000000000 +0100
@@ -591,8 +591,7 @@
if (chdlc_set_intr_mode(card, APP_INT_ON_TIMER)){
- printk (KERN_INFO "%s:
- Failed to set interrupt triggers!\n",
+ printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
card->devname);
return -EIO;
}
--- linux.vanilla/drivers/sound/cs46xx.c 2003-06-14 00:11:37.000000000 +0100
+++ linux.21-ac3/drivers/sound/cs46xx.c 2003-06-22 13:36:11.000000000 +0100
@@ -947,8 +950,8 @@
struct InitStruct
{
- u32 long off;
- u32 long val;
+ u32 off;
+ u32 val;
} InitArray[] = { {0x00000040, 0x3fc0000f},
{0x0000004c, 0x04800000},
--- linux.vanilla/net/decnet/dn_table.c 2001-12-21 17:42:05.000000000 +0000
+++ linux.21-ac3/net/decnet/dn_table.c 2003-05-28 15:37:27.000000000 +0100
@@ -836,8 +836,7 @@
return NULL;
if (in_interrupt() && net_ratelimit()) {
- printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table
-from interrupt\n");
+ printk(KERN_DEBUG "DECnet: BUG! Attempt to create routing table from interrupt\n");
return NULL;
}
if ((t = kmalloc(sizeof(struct dn_fib_table), GFP_KERNEL)) == NULL)
next prev parent reply other threads:[~2003-06-27 17:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-26 22:03 Linux 2.4.22-pre2 Marcelo Tosatti
2003-06-26 22:54 ` J.A. Magallon
2003-06-26 23:06 ` [PATCH] gcc_check for x86 J.A. Magallon
2003-06-26 23:08 ` [PATCH] fix inlining with gcc3 J.A. Magallon
2003-06-26 23:36 ` Kurt Wall
2003-06-27 10:50 ` Alan Cox
2003-06-27 14:22 ` J.A. Magallon
2003-06-26 23:31 ` [PATCH] kill extra printk prototype J.A. Magallon
2003-06-27 14:02 ` Adrian Bunk
2003-06-26 23:32 ` [PATCH] kill duplicate pci_id J.A. Magallon
2003-06-27 5:59 ` Linux 2.4.22-pre2 Marc-Christian Petersen
2003-06-27 8:44 ` Matthias Andree
2003-06-27 17:58 ` Adrian Bunk [this message]
2003-06-27 18:56 ` Alessandro Suardi
2003-06-27 23:36 ` [BUG?] do_generic_direct_write J.A. Magallon
2003-07-04 20:55 ` J.A. Magallon
2003-06-27 23:38 ` Linux 2.4.22-pre2 Krzysztof Halasa
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=20030627175853.GJ24661@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
/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;
as well as URLs for NNTP newsgroup(s).