Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e64ed022 authored by Robert Reif's avatar Robert Reif Committed by David S. Miller
Browse files

sparc: Fix tty compile warnings. 



This patch fixes tty compile warnings as sugested by Alan Cox:

CC drivers/char/n_tty.o
drivers/char/n_tty.c: In function ‘normal_poll’:
drivers/char/n_tty.c:1555: warning: array subscript is above array bounds
drivers/char/n_tty.c:1564: warning: array subscript is above array bounds
drivers/char/n_tty.c: In function ‘read_chan’:
drivers/char/n_tty.c:1269: warning: array subscript is above array bounds
CC drivers/char/tty_ioctl.o
drivers/char/tty_ioctl.c: In function ‘set_termios’:
drivers/char/tty_ioctl.c:533: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c:537: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c: In function ‘tty_mode_ioctl’:
drivers/char/tty_ioctl.c:662: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c:892: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c:896: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c:577: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c:928: warning: array subscript is above array 
bounds
drivers/char/tty_ioctl.c:934: warning: array subscript is above array 
bounds

Signed-off-by: default avatarRobert Reif <reif@earthlink.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5acdc1fa

arch/sparc/include/asm/termbits.h

+5 −6
Original line number Original line Diff line number Diff line
@@ -29,10 +29,11 @@ struct termios { 
	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_line;			/* line discipline */

	cc_t c_line;			/* line discipline */

#ifndef __KERNEL__

	cc_t c_cc[NCCS];		/* control characters */

	cc_t c_cc[NCCS];		/* control characters */

#ifdef __KERNEL__

#else

	cc_t c_cc[NCCS+2];	/* kernel needs 2 more to hold vmin/vtime */

#define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t))

#define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t))

	cc_t _x_cc[2];                  /* We need them to hold vmin/vtime */

#endif

#endif

};

};
@@ -42,8 +43,7 @@ struct termios2 { 
	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_line;			/* line discipline */

	cc_t c_line;			/* line discipline */

	cc_t c_cc[NCCS];		/* control characters */

	cc_t c_cc[NCCS+2];		/* control characters */

	cc_t _x_cc[2];                  /* padding to match ktermios */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ospeed;		/* output speed */

	speed_t c_ospeed;		/* output speed */

};

};
@@ -54,8 +54,7 @@ struct ktermios { 
	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_line;			/* line discipline */

	cc_t c_line;			/* line discipline */

	cc_t c_cc[NCCS];		/* control characters */

	cc_t c_cc[NCCS+2];		/* control characters */

	cc_t _x_cc[2];                  /* We need them to hold vmin/vtime */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ospeed;		/* output speed */

	speed_t c_ospeed;		/* output speed */

};

};