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.
This commit is contained in:
parent
2fdba24620
commit
81155f8fa8
11
init/init.c
11
init/init.c
@ -71,18 +71,23 @@ static const int VT_GETSTATE = 0x5603; /* get global vt state info */
|
|||||||
struct serial_struct {
|
struct serial_struct {
|
||||||
int type;
|
int type;
|
||||||
int line;
|
int line;
|
||||||
int port;
|
unsigned int port;
|
||||||
int irq;
|
int irq;
|
||||||
int flags;
|
int flags;
|
||||||
int xmit_fifo_size;
|
int xmit_fifo_size;
|
||||||
int custom_divisor;
|
int custom_divisor;
|
||||||
int baud_base;
|
int baud_base;
|
||||||
unsigned short close_delay;
|
unsigned short close_delay;
|
||||||
char reserved_char[2];
|
char io_type;
|
||||||
|
char reserved_char[1];
|
||||||
int hub6;
|
int hub6;
|
||||||
unsigned short closing_wait; /* time to wait before closing */
|
unsigned short closing_wait; /* time to wait before closing */
|
||||||
unsigned short closing_wait2; /* no longer used... */
|
unsigned short closing_wait2; /* no longer used... */
|
||||||
int reserved[4];
|
unsigned char *iomem_base;
|
||||||
|
unsigned short iomem_reg_shift;
|
||||||
|
unsigned int port_high;
|
||||||
|
unsigned long iomap_base; /* cookie passed into ioremap */
|
||||||
|
int reserved[1];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user