From 0fbd1306780318dbc52c1bd79c6f0509c3b11768 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Wed, 24 Sep 2014 06:26:21 -0400 Subject: [PATCH] tty: Fix width of unsigned long bitfield padding Commit 1c70f2cf581a16838ee292bb6d2e07a1778a18d1, 'tty: Serialize tcflow() with other tty flow control changes' and commit 393a0396b977f3a3e22fe31336363ef8b6821ac0, '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: Fengguang Wu Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- include/linux/tty.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/tty.h b/include/linux/tty.h index 546e945578956..5171ef8f7b850 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -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; -- 2.39.5