Re: [PATCH] gcc4 fix for sn_serial.c

[Andreas Schwab <schwab@suse.de>]

Andreas Schwab <schwab@suse.de> writes:

> Jesse Barnes <jbarnes@engr.sgi.com> writes:
>
>> On Monday, March 14, 2005 5:03 pm, Adrian Bunk wrote:
>>> > -static struct uart_driver sal_console_uart = {
>>> > +struct uart_driver sal_console_uart = {
>>> >   .owner = THIS_MODULE,
>>> >   .driver_name = "sn_console",
>>> >   .dev_name = DEVICE_NAME,
>>>
>>> Why can't you solve this without making sal_console_uart global?
>>
>> I think that would mean moving some of the structure initializaiton into an 
>> init function somewhere.
>
> Just make the tentative definition static.

And this is the complete patch:

Make sal_console_uart static again.

Signed-off-by: Andreas Schwab <schwab@suse.de>

--- linux-2.6/drivers/serial/sn_console.c.~1~	2005-04-25 00:33:34.000000000 +0200
+++ linux-2.6/drivers/serial/sn_console.c	2005-04-27 01:05:29.000000000 +0200
@@ -787,7 +787,7 @@ static void __init sn_sal_switch_to_inte
 
 static void sn_sal_console_write(struct console *, const char *, unsigned);
 static int __init sn_sal_console_setup(struct console *, char *);
-extern struct uart_driver sal_console_uart;
+static struct uart_driver sal_console_uart;
 extern struct tty_driver *uart_console_device(struct console *, int *);
 
 static struct console sal_console = {
@@ -801,7 +801,7 @@ static struct console sal_console = {
 
 #define SAL_CONSOLE	&sal_console
 
-struct uart_driver sal_console_uart = {
+static struct uart_driver sal_console_uart = {
 	.owner = THIS_MODULE,
 	.driver_name = "sn_console",
 	.dev_name = DEVICE_NAME,

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."