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

Commit 2507c856 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fixes from Thomas Gleixner:
 "Two smallish fixes:

   - use the proper asm constraint in the Super-H atomic_fetch_ops

   - a trivial typo fix in the Kconfig help text"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/hung_task: Fix typo in CONFIG_DETECT_HUNG_TASK help text
  locking/atomic, arch/sh: Fix ATOMIC_FETCH_OP()
parents 709b8f67 96b03ab8

arch/sh/include/asm/atomic-llsc.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ 
"	movco.l	%0, @%3					\n"		\

"	bf	1b					\n"		\

"	synco						\n"		\

	: "=&z" (temp), "=&z" (res)					\

	: "=&z" (temp), "=&r" (res)					\

	: "r" (i), "r" (&v->counter)					\

	: "t");								\

									\

lib/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ config DETECT_HUNG_TASK 
	help

	  Say Y here to enable the kernel to detect "hung tasks",

	  which are bugs that cause the task to be stuck in

	  uninterruptible "D" state indefinitiley.

	  uninterruptible "D" state indefinitely.



	  When a hung task is detected, the kernel will print the

	  current stack trace (which you should report), but the