2005-03-15 17:14:11

by Mikael Pettersson

[permalink] [raw]
Subject: [PATCH][2.6.11] generic_serial.h gcc4 fix

Fix

drivers/char/generic_serial.c:38: error: static declaration of 'gs_debug' follows non-static declaration
include/linux/generic_serial.h:94: error: previous declaration of 'gs_debug' was here

compilation error from gcc4 in generic_serial.h.

/Mikael

--- linux-2.6.11/include/linux/generic_serial.h.~1~ 2005-03-02 19:24:19.000000000 +0100
+++ linux-2.6.11/include/linux/generic_serial.h 2005-03-15 17:11:07.000000000 +0100
@@ -91,6 +91,4 @@ int gs_setserial(struct gs_port *port,
int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
void gs_got_break(struct gs_port *port);

-extern int gs_debug;
-
#endif


2005-03-15 17:42:33

by Adrian Bunk

[permalink] [raw]
Subject: Re: [PATCH][2.6.11] generic_serial.h gcc4 fix

On Tue, Mar 15, 2005 at 06:13:33PM +0100, Mikael Pettersson wrote:
> Fix
>
> drivers/char/generic_serial.c:38: error: static declaration of 'gs_debug' follows non-static declaration
> include/linux/generic_serial.h:94: error: previous declaration of 'gs_debug' was here
>
> compilation error from gcc4 in generic_serial.h.
>
> /Mikael
>
> --- linux-2.6.11/include/linux/generic_serial.h.~1~ 2005-03-02 19:24:19.000000000 +0100
> +++ linux-2.6.11/include/linux/generic_serial.h 2005-03-15 17:11:07.000000000 +0100
> @@ -91,6 +91,4 @@ int gs_setserial(struct gs_port *port,
> int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
> void gs_got_break(struct gs_port *port);
>
> -extern int gs_debug;
> -
> #endif

This patch is already in -mm for ages.

When doing such patches, -mm is usually a better basis than Linus' tree.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-03-16 06:32:09

by Rogier Wolff

[permalink] [raw]
Subject: Re: [PATCH][2.6.11] generic_serial.h gcc4 fix

On Tue, Mar 15, 2005 at 06:39:46PM +0100, Adrian Bunk wrote:
> > @@ -91,6 +91,4 @@ int gs_setserial(struct gs_port *port,
> > int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
> > void gs_got_break(struct gs_port *port);
> >
> > -extern int gs_debug;
> > -
> > #endif
>
> This patch is already in -mm for ages.
>
> When doing such patches, -mm is usually a better basis than Linus' tree.

Note that the original reason for doing "extern int gs_debug" was that
sx.c used to have an ioctl to fiddle with it "live". Apparently
someone removed that piece of useful, but(t) ugly code, as it is no
longer there.

Roger.


--
** [email protected] ** http://www.BitWizard.nl/ ** +31-15-2600998 **
*-- BitWizard writes Linux device drivers for any device you may have! --*
Q: It doesn't work. A: Look buddy, doesn't work is an ambiguous statement.
Does it sit on the couch all day? Is it unemployed? Please be specific!
Define 'it' and what it isn't doing. --------- Adapted from lxrbot FAQ