Commit 980f88e4 authored by Johannes Berg's avatar Johannes Berg Committed by Ingo Molnar

sched/wait: Suppress Sparse 'variable shadowing' warning

This warning seems to show up a lot now, since ___wait_event()
is (indirectly) used inside wait_event_timeout(), which also
has a variable called __ret. Rename the one in ___wait_event()
to ___ret (another leading underscore) to suppress the warning.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/1391704121.12789.20.camel@jlt4.sipsolutions.netSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 65370bdf
...@@ -195,7 +195,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); ...@@ -195,7 +195,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
({ \ ({ \
__label__ __out; \ __label__ __out; \
wait_queue_t __wait; \ wait_queue_t __wait; \
long __ret = ret; \ long ___ret = ret; \
\ \
INIT_LIST_HEAD(&__wait.task_list); \ INIT_LIST_HEAD(&__wait.task_list); \
if (exclusive) \ if (exclusive) \
...@@ -210,7 +210,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); ...@@ -210,7 +210,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
break; \ break; \
\ \
if (___wait_is_interruptible(state) && __int) { \ if (___wait_is_interruptible(state) && __int) { \
__ret = __int; \ ___ret = __int; \
if (exclusive) { \ if (exclusive) { \
abort_exclusive_wait(&wq, &__wait, \ abort_exclusive_wait(&wq, &__wait, \
state, NULL); \ state, NULL); \
...@@ -222,7 +222,7 @@ wait_queue_head_t *bit_waitqueue(void *, int); ...@@ -222,7 +222,7 @@ wait_queue_head_t *bit_waitqueue(void *, int);
cmd; \ cmd; \
} \ } \
finish_wait(&wq, &__wait); \ finish_wait(&wq, &__wait); \
__out: __ret; \ __out: ___ret; \
}) })
#define __wait_event(wq, condition) \ #define __wait_event(wq, condition) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment