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

Commit 7e605987 authored by Palmer Dabbelt's avatar Palmer Dabbelt Committed by Ingo Molnar
Browse files

sched/wait: Change wait_on_bit*() to take an unsigned long *, not a void * 



The implementations of wait_on_bit*() will only work with long-aligned
memory on systems that don't support misaligned loads and stores.

This patch changes the function prototypes to ensure that the compiler
will enforce alignment.

Running

  make defconfig
  make KFLAGS="-Werror"

seems to indicate that, as of c56fb6564dcd ("Fix a misaligned load
inside ptrace_attach()"), there are now no users of non-long-aligned
calls to wait_on_bit*().  I additionally tried a few "make randconfig"
attempts, none of which failed to compile for this reason.

Signed-off-by: default avatarPalmer Dabbelt <palmer@dabbelt.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bobby.prani@gmail.com
Cc: oleg@redhat.com
Cc: paulmck@linux.vnet.ibm.com
Cc: richard@nod.at
Cc: vdavydov@parallels.com
Link: http://lkml.kernel.org/r/1430453997-32459-3-git-send-email-palmer@dabbelt.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b76808e6

include/linux/wait.h

+10 −7
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ extern int bit_wait_io_timeout(struct wait_bit_key *); 
 * on that signal.

 */

static inline int

wait_on_bit(void *word, int bit, unsigned mode)

wait_on_bit(unsigned long *word, int bit, unsigned mode)

{

	might_sleep();

	if (!test_bit(bit, word))
@@ -994,7 +994,7 @@ wait_on_bit(void *word, int bit, unsigned mode) 
 * on that signal.

 */

static inline int

wait_on_bit_io(void *word, int bit, unsigned mode)

wait_on_bit_io(unsigned long *word, int bit, unsigned mode)

{

	might_sleep();

	if (!test_bit(bit, word))
@@ -1020,7 +1020,8 @@ wait_on_bit_io(void *word, int bit, unsigned mode) 
 * received a signal and the mode permitted wakeup on that signal.

 */

static inline int

wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout)

wait_on_bit_timeout(unsigned long *word, int bit, unsigned mode,

		    unsigned long timeout)

{

	might_sleep();

	if (!test_bit(bit, word))
@@ -1047,7 +1048,8 @@ wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout) 
 * on that signal.

 */

static inline int

wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode)

wait_on_bit_action(unsigned long *word, int bit, wait_bit_action_f *action,

		   unsigned mode)

{

	might_sleep();

	if (!test_bit(bit, word))
@@ -1075,7 +1077,7 @@ wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode 
 * the @mode allows that signal to wake the process.

 */

static inline int

wait_on_bit_lock(void *word, int bit, unsigned mode)

wait_on_bit_lock(unsigned long *word, int bit, unsigned mode)

{

	might_sleep();

	if (!test_and_set_bit(bit, word))
@@ -1099,7 +1101,7 @@ wait_on_bit_lock(void *word, int bit, unsigned mode) 
 * the @mode allows that signal to wake the process.

 */

static inline int

wait_on_bit_lock_io(void *word, int bit, unsigned mode)

wait_on_bit_lock_io(unsigned long *word, int bit, unsigned mode)

{

	might_sleep();

	if (!test_and_set_bit(bit, word))
@@ -1125,7 +1127,8 @@ wait_on_bit_lock_io(void *word, int bit, unsigned mode) 
 * the @mode allows that signal to wake the process.

 */

static inline int

wait_on_bit_lock_action(void *word, int bit, wait_bit_action_f *action, unsigned mode)

wait_on_bit_lock_action(unsigned long *word, int bit, wait_bit_action_f *action,

			unsigned mode)

{

	might_sleep();

	if (!test_and_set_bit(bit, word))