From: tip-bot for Johannes Berg <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, rostedt@goodmis.org,
akpm@linux-foundation.org, johannes.berg@intel.com,
tglx@linutronix.de
Subject: [tip:core/locking] sched/wait: Suppress Sparse ' variable shadowing' warning
Date: Mon, 10 Feb 2014 05:28:55 -0800 [thread overview]
Message-ID: <tip-980f88e414418bf65569a3b62b08b07e6fc2f4c6@git.kernel.org> (raw)
In-Reply-To: <1391704121.12789.20.camel@jlt4.sipsolutions.net>
Commit-ID: 980f88e414418bf65569a3b62b08b07e6fc2f4c6
Gitweb: http://git.kernel.org/tip/980f88e414418bf65569a3b62b08b07e6fc2f4c6
Author: Johannes Berg <johannes.berg@intel.com>
AuthorDate: Thu, 6 Feb 2014 17:28:41 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 9 Feb 2014 13:11:49 +0100
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Peter 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.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/wait.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 559044c..c55ea5c 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -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) \
next prev parent reply other threads:[~2014-02-10 13:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-06 16:13 [PATCH] lib: Fix some sparse warnings in devres.c Steven Rostedt
2014-02-06 16:28 ` [PATCH] sched/wait: suppress sparse 'variable shadowing' warning Johannes Berg
2014-02-06 16:45 ` Peter Zijlstra
2014-02-06 16:52 ` Steven Rostedt
2014-02-09 12:44 ` Ingo Molnar
2014-02-10 13:28 ` tip-bot for Johannes Berg [this message]
2014-02-15 19:41 ` [PATCH] lib: Fix some sparse warnings in devres.c Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-980f88e414418bf65569a3b62b08b07e6fc2f4c6@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome