[BusyBox-cvs] busybox.stable init.c,1.181,1.182

[Erik Andersen]

Update of /var/cvs/busybox.stable
In directory winder:/tmp/cvs-serv15672

Modified Files:
	init.c 
Log Message:
Update definition of struct serial_struct, per linux-2.6.0-test5,
to avoid stack corruption problems on some 64bit architectures
when sizeof(void*) != sizeof(int).  Thanks to Atsushi Nemoto
for finding this problem.


Index: init.c
===================================================================
RCS file: /var/cvs/busybox.stable/init.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- init.c	26 Jul 2003 06:25:12 -0000	1.181
+++ init.c	11 Sep 2003 08:52:22 -0000	1.182
@@ -64,20 +64,25 @@
 
 /* From <linux/serial.h> */
 struct serial_struct {
-	int     type;
-	int     line;
-	int     port;
-	int     irq;
-	int     flags;
-	int     xmit_fifo_size;
-	int     custom_divisor;
-	int     baud_base;
-	unsigned short  close_delay;
-	char    reserved_char[2];
-	int     hub6;
-	unsigned short  closing_wait; /* time to wait before closing */
-	unsigned short  closing_wait2; /* no longer used... */
-	int     reserved[4];
+	int	type;
+	int	line;
+	unsigned int	port;
+	int	irq;
+	int	flags;
+	int	xmit_fifo_size;
+	int	custom_divisor;
+	int	baud_base;
+	unsigned short	close_delay;
+	char	io_type;
+	char	reserved_char[1];
+	int	hub6;
+	unsigned short	closing_wait; /* time to wait before closing */
+	unsigned short	closing_wait2; /* no longer used... */
+	unsigned char	*iomem_base;
+	unsigned short	iomem_reg_shift;
+	unsigned int	port_high;
+	unsigned long	iomap_base;	/* cookie passed into ioremap */
+	int	reserved[1];
 };