Linus,
please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
locking-urgent-for-linus
Two smallish fixes:
- Use the proper asm constraint in the Super-H atomic_fetch_ops
- A trivial typo fix in the Kconfig help text
Thanks,
tglx
------------------>
Peter Zijlstra (1):
locking/atomic, arch/sh: Fix ATOMIC_FETCH_OP()
Vivien Didelot (1):
locking/hung_task: Fix typo in CONFIG_DETECT_HUNG_TASK help text
arch/sh/include/asm/atomic-llsc.h | 2 +-
lib/Kconfig.debug | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sh/include/asm/atomic-llsc.h
b/arch/sh/include/asm/atomic-llsc.h
index caea2c45f6c2..1d159ce50f5a 100644
--- a/arch/sh/include/asm/atomic-llsc.h
+++ b/arch/sh/include/asm/atomic-llsc.h
@@ -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"); \
\
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2e2cca509231..cab7405f48d2 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -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
