Skip to contentSkip to conversation

[2.6.11] generic_serial.h gcc4 fix

PATCH In review Mikael Pettersson 3 participants 3 messages Mar 15, 2005 – Mar 16, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 [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

include/linux/generic_serial.h renamed from include/linux/generic_serial.h.~1~ +0 -2
@@ -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
#1 lore raw
Quoted 12 lines · Mikael Pettersson

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

include/linux/generic_serial.h int gs_setserial(struct gs_port *port, · line 94

Quoted 6 lines
include/linux/generic_serial.h renamed from include/linux/generic_serial.h.~1~ +0 -2
@@ -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

Signature · 4 lines
       "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
#2 lore raw
Quoted 11 lines · Adrian Bunk

include/linux/generic_serial.h int gs_setserial(struct gs_port *port, · line 94

Quoted 7 lines
include/linux/generic_serial.h renamed from include/linux/generic_serial.h.~1~ +0 -2
@@ -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.

Signature · 5 lines
** [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