提交 f207dbe6 编写于 作者: I Ingo Molnar

Revert "sched/wait: Suppress Sparse 'variable shadowing' warning"

This reverts commit 980f88e4.

This warning is actually useful, don't suppress it.

We actually rely on the shadowing for ___wait_cond_timeout().

We further used the __ret variable in __wait_event_timeout()'s cmd
argument: __ret = schedule_timeout(__ret). That now explicitly uses the
wrong __ret.
Reported-by: NGregory CLEMENT <gregory.clement@free-electrons.com>
Requested-by: NAndrew Morton <akpm@linux-foundation.org>
Requested-by: NPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-Q5blhuqqzwgVwvjf1gszrdol@git.kernel.orgSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 47be1c1a
......@@ -195,7 +195,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
({ \
__label__ __out; \
wait_queue_t __wait; \
long ___ret = ret; \
long __ret = ret; \
\
INIT_LIST_HEAD(&__wait.task_list); \
if (exclusive) \
......@@ -210,7 +210,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
break; \
\
if (___wait_is_interruptible(state) && __int) { \
___ret = __int; \
__ret = __int; \
if (exclusive) { \
abort_exclusive_wait(&wq, &__wait, \
state, NULL); \
......@@ -222,7 +222,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
cmd; \
} \
finish_wait(&wq, &__wait); \
__out: ___ret; \
__out: __ret; \
})
#define __wait_event(wq, condition) \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册