From: Carl-Daniel Hailfinger <c-d.hailfinger.kernel.2003@gmx.net>
To: Marcelo Tosatti <marcelo@conectiva.com.br>
Cc: Olaf Hering <olh@suse.de>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.4.21-rc1
Date: Wed, 30 Apr 2003 23:30:38 +0200 [thread overview]
Message-ID: <3EB0407E.6090603@gmx.net> (raw)
In-Reply-To: <20030423224635.A25828@suse.de>
Hello Marcelo,
for your convenience I stripped the patch from the parts which should
not be applied, leaving only genuine bugfixes in the patch.
Olaf Hering wrote:
> On Mon, Apr 21, Marcelo Tosatti wrote:
>
>>Here goes the first candidate for 2.4.21.
>>
>>Please test it extensively.
>
>
> 2.4.20 needs these patches to compile with gcc3.3. It does still apply
> to 2.4.21-rc1.
The part mentioned below was removed.
> The extern inline -> static inline is only a workaround and must not go
> in, I hope a more recent gcc-3.3 has a fix for the inline bugs.
Please apply,
Carl-Daniel
Please review:
drivers/net/irda/ma600.c | 2 +-
drivers/net/tokenring/olympic.c | 4 ++--
drivers/sound/cs46xx.c | 4 ++--
net/decnet/dn_table.c | 3 +--
4 files changed, 6 insertions(+), 7 deletions(-)
diff -purNX /kernel_exclude.txt linux_ppc/drivers/net/irda/ma600.c linux_ppc/drivers/net/irda/ma600.c
--- linux_ppc/drivers/net/irda/ma600.c 2002-11-28 23:53:13.000000000 +0000
+++ linux_ppc/drivers/net/irda/ma600.c 2003-02-03 12:51:14.000000000 +0000
@@ -53,7 +53,7 @@
if(!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n",\
#expr,__FILE__,__FUNCTION__,__LINE__); \
- ##func}
+ func}
#endif
/* convert hex value to ascii hex */
diff -purNX /kernel_exclude.txt linux_ppc/drivers/net/tokenring/olympic.c linux_ppc/drivers/net/tokenring/olympic.c
--- linux_ppc/drivers/net/tokenring/olympic.c 2002-11-28 23:53:14.000000000 +0000
+++ linux_ppc/drivers/net/tokenring/olympic.c 2003-02-03 12:46:04.000000000 +0000
@@ -655,8 +655,8 @@ static int olympic_open(struct net_devic
printk(" stat_ring[7]: %p\n", &(olympic_priv->olympic_rx_status_ring[7]) );
printk("RXCDA: %x, rx_ring[0]: %p\n",readl(olympic_mmio+RXCDA),&olympic_priv->olympic_rx_ring[0]);
- printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr =
-%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
+ printk("Rx_ring_dma_addr = %08x, rx_status_dma_addr ="
+"%08x\n",olympic_priv->rx_ring_dma_addr,olympic_priv->rx_status_ring_dma_addr) ;
#endif
writew((((readw(olympic_mmio+RXENQ)) & 0x8000) ^ 0x8000) | i,olympic_mmio+RXENQ);
diff -purNX /kernel_exclude.txt linux_ppc/drivers/sound/cs46xx.c linux_ppc/drivers/sound/cs46xx.c
--- linux_ppc/drivers/sound/cs46xx.c 2002-08-03 00:39:44.000000000 +0000
+++ linux_ppc/drivers/sound/cs46xx.c 2003-02-03 12:51:14.000000000 +0000
@@ -947,8 +947,8 @@ static void cs_play_setup(struct cs_stat
struct InitStruct
{
- u32 long off;
- u32 long val;
+ u32 off;
+ u32 val;
} InitArray[] = { {0x00000040, 0x3fc0000f},
{0x0000004c, 0x04800000},
diff -purNX linux/kernel_exclude.txt linux_ppc.orig/net/decnet/dn_table.c linux_ppc/net/decnet/dn_table.c
--- linux_ppc.orig/net/decnet/dn_table.c 2001-12-21 17:42:05.000000000 +0000
+++ linux_ppc/net/decnet/dn_table.c 2003-02-06 08:24:01.000000000 +0000
@@ -836,8 +836,7 @@ struct dn_fib_table *dn_fib_get_table(in
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-05-01 2:27 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-04-21 18:47 Linux 2.4.21-rc1 Marcelo Tosatti
2003-04-21 19:58 ` Stephan von Krawczynski
2003-04-21 22:49 ` Ben Greear
2003-04-21 23:24 ` Willy Tarreau
2003-04-21 23:10 ` J.A. Magallon
2003-04-21 23:39 ` Linux 2.4.21-rc1 - unresolved Eyal Lebedinsky
2003-04-22 7:15 ` Marc-Christian Petersen
2003-04-23 19:44 ` Bill Davidsen
2003-04-23 19:51 ` Marcelo Tosatti
2003-04-24 11:27 ` Marc-Christian Petersen
2003-04-24 11:32 ` Marc-Christian Petersen
2003-04-24 11:37 ` Christoph Hellwig
2003-05-06 2:48 ` Mike Fedyk
2003-04-22 3:00 ` Linux 2.4.21-rc1 Corey Minyard
2003-04-22 21:49 ` Marcelo Tosatti
2003-04-22 22:54 ` Corey Minyard
2003-04-22 13:42 ` Geert Uytterhoeven
2003-04-22 17:09 ` Rene Rebe
2003-04-22 19:15 ` Lukasz Trabinski
2003-04-22 22:59 ` J.A. Magallon
2003-04-23 7:59 ` IEEE-1394 problem on init [ was Re: Linux 2.4.21-rc1 ] Stelian Pop
2003-04-23 8:08 ` Linux 2.4.21-rc1 Jerome Chantelauze
2003-04-23 15:09 ` Athanasius
2003-04-23 20:46 ` Olaf Hering
2003-04-30 21:30 ` Carl-Daniel Hailfinger [this message]
2003-04-25 3:06 ` Lucas Correia Villa Real
2003-06-07 19:35 ` Adrian Bunk
2003-06-11 4:27 ` Lucas Correia Villa Real
2003-04-25 3:13 ` Lucas Correia Villa Real
2003-04-25 14:15 ` Andreas Metzler
2003-04-25 14:27 ` Martin Josefsson
2003-04-25 14:46 ` Andreas Metzler
2003-04-25 16:19 ` Zed Pobre
2003-04-25 16:24 ` Marc-Christian Petersen
2003-05-06 2:57 ` Mike Fedyk
[not found] <cistron.Pine.LNX.4.53L.0304211545580.12940@freak.distro.conectiva>
[not found] ` <E198M48-0000tC-00@ncc1701.cistron.net>
2003-04-23 15:36 ` Athanasius
2003-04-23 16:40 ` Athanasius
2003-04-25 16:17 ` Bill Davidsen
2003-04-25 20:30 ` Athanasius
2003-05-06 4:30 ` Mike Fedyk
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=3EB0407E.6090603@gmx.net \
--to=c-d.hailfinger.kernel.2003@gmx.net \
--cc=marcelo@conectiva.com.br \
--cc=olh@suse.de \
/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).