2.5.41 does not build: 8250.c: icount has incomplete type.

gcc -Wp,-MD,drivers/serial/.8250.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -Iarch/i386/mach-generic -nostdinc -iwithprefix include
-DMODULE -DKBUILD_BASENAME=8250 -DEXPORT_SYMTAB -c -o
drivers/serial/8250.o drivers/serial/8250.c
In file included from drivers/serial/8250.c:34:
include/linux/serialP.h:50: field `icount' has incomplete type make[3]: *** [drivers/serial/8250.o] Error 1
make[2]: *** [drivers/serial] Error 2
make[1]: *** [drivers] Error 2
make[1]: Leaving directory `/home/nick/soft/linux-2.5.41'
make: *** [stamp-build] Error 2

This should fix it. Committing and sending this patch is currently waiting on Hu Gang to confirm that the second hunk fixes his problem.

I'm working towards getting rid of serialP.h in 8250.c; its been the cause of several problems that have configuration-specific thus far. We really shouldn't need anything from that header.

===== drivers/serial/8250.c 1.13 vs edited =====

@@ -31,8 +31,8 @@
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/serial_reg.h>
-#include <linux/serialP.h>
 #include <linux/serial.h>
+#include <linux/serialP.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>

@@ -1635,7 +1635,7 @@
 	if (up->port.type != PORT_RSA && res_rsa)
 		release_resource(res_rsa);
 
-	if (up->port.type == PORT_UNKNOWN)
+	if (up->port.type == PORT_UNKNOWN && res_std)
 		release_resource(res_std);
 }
 

Russell King ([email protected])                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html