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

Commit cc952e70 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Fix width of unsigned long bitfield padding 



Commit c545b66c,
'tty: Serialize tcflow() with other tty flow control changes' and
commit 99416322,
'tty: Workaround Alpha non-atomic byte storage in tty_struct' work around
compiler bugs and non-atomic storage on multiple arches by padding
bitfields out to the declared type which is unsigned long. However, the
width varies by arch.

Pad bitfields to actual width of unsigned long (which is BITS_PER_LONG).

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99416322

include/linux/tty.h

+2 −2
Original line number Diff line number Diff line
@@ -264,11 +264,11 @@ struct tty_struct { 
	struct winsize winsize;		/* winsize_mutex */

	unsigned long stopped:1,	/* flow_lock */

		      flow_stopped:1,

		      unused:62;

		      unused:BITS_PER_LONG - 2;

	int hw_stopped;

	unsigned long ctrl_status:8,	/* ctrl_lock */

		      packet:1,

		      unused_ctrl:55;

		      unused_ctrl:BITS_PER_LONG - 9;

	unsigned int receive_room;	/* Bytes free for queue */

	int flow_change;