From: tip-bot for Ben Hutchings <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: torvalds@linux-foundation.org, tglx@linutronix.de,
linux-kernel@vger.kernel.org, peterz@infradead.org,
ben@decadent.org.uk, hpa@zytor.com, mingo@kernel.org,
sasha.levin@oracle.com
Subject: [tip:locking/core] tools/lib/lockdep: Fix 'unused value' warnings
Date: Mon, 5 Jun 2017 02:03:29 -0700 [thread overview]
Message-ID: <tip-bb7ea2a9af4c98ed70adf7627a2ba5d1ff1725e0@git.kernel.org> (raw)
In-Reply-To: <20170525130005.5947-6-alexander.levin@verizon.com>
Commit-ID: bb7ea2a9af4c98ed70adf7627a2ba5d1ff1725e0
Gitweb: http://git.kernel.org/tip/bb7ea2a9af4c98ed70adf7627a2ba5d1ff1725e0
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:37 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:05 +0200
tools/lib/lockdep: Fix 'unused value' warnings
liblockdep defines various macros that may expand to an expression
with no effect, while the in-kernel definition does have an effect.
This results in warnings from gcc when -Wunused-value is enabled, and
is is enabled by -Wall. Fix this by introducing trivial functions,
as function return values are generally allowed to be ignored.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-6-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/debug_locks.h | 2 +-
tools/lib/lockdep/uinclude/linux/kernel.h | 12 +++++++++---
tools/lib/lockdep/uinclude/linux/lockdep.h | 6 +++++-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/lib/lockdep/uinclude/linux/debug_locks.h b/tools/lib/lockdep/uinclude/linux/debug_locks.h
index f38eb64..1d4fbec 100644
--- a/tools/lib/lockdep/uinclude/linux/debug_locks.h
+++ b/tools/lib/lockdep/uinclude/linux/debug_locks.h
@@ -4,7 +4,7 @@
#include <stddef.h>
#include <linux/compiler.h>
-#define DEBUG_LOCKS_WARN_ON(x) (x)
+#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
extern bool debug_locks;
extern bool debug_locks_silent;
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index da87bd9..021cff4 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -22,10 +22,16 @@
_max1 > _max2 ? _max1 : _max2; })
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-#define WARN_ON(x) (x)
-#define WARN_ON_ONCE(x) (x)
+
+static inline int lockdep_warn(int condition)
+{
+ return condition;
+}
+#define WARN_ON(x) lockdep_warn(x)
+#define WARN_ON_ONCE(x) WARN_ON(x)
+#define WARN(x, y...) WARN_ON(x)
+
#define likely(x) (x)
-#define WARN(x, y...) (x)
#define uninitialized_var(x) x
#define __init
#define noinline
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d302142..d107903 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -29,7 +29,11 @@ extern struct task_struct *__curr(void);
#define current (__curr())
-#define debug_locks_off() 1
+static inline int debug_locks_off(void)
+{
+ return 1;
+}
+
#define task_pid_nr(tsk) ((tsk)->pid)
#define KSYM_NAME_LEN 128
next prev parent reply other threads:[~2017-06-05 9:08 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 01/21] liblockdep: Fix undefined symbol prandom_u32 Levin, Alexander (Sasha Levin)
2017-06-05 9:01 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 02/21] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth Levin, Alexander (Sasha Levin)
2017-06-05 9:01 ` [tip:locking/core] tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro Levin, Alexander (Sasha Levin)
2017-06-05 9:02 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 04/21] liblockdep: Enable -Wall by default Levin, Alexander (Sasha Levin)
2017-06-05 9:02 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 05/21] liblockdep: Fix 'unused value' warnings Levin, Alexander (Sasha Levin)
2017-06-05 9:03 ` tip-bot for Ben Hutchings [this message]
2017-05-25 12:58 ` [PATCH 06/21] liblockdep: Fix 'set but not used' warnings Levin, Alexander (Sasha Levin)
2017-06-05 9:04 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for init_utsname() Levin, Alexander (Sasha Levin)
2017-06-05 9:04 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 08/21] liblockdep: Remove -lpthread compiler option Levin, Alexander (Sasha Levin)
2017-06-05 9:05 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Vishal Thanki
2017-05-25 12:58 ` [PATCH 09/21] MAINTAINERS: update email for Sasha Levin Levin, Alexander (Sasha Levin)
2017-06-05 9:05 ` [tip:locking/core] MAINTAINERS: Update " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 10/21] tools: add install make target for liblockdep Levin, Alexander (Sasha Levin)
2017-06-05 9:06 ` [tip:locking/core] tools: Add " tip-bot for Alexander Sverdlin
2017-05-25 12:58 ` [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO Levin, Alexander (Sasha Levin)
2017-06-05 9:06 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Alexander Sverdlin
2017-05-25 12:58 ` [PATCH 12/21] tools: liblockdep: fix compilation for 4.11 Levin, Alexander (Sasha Levin)
2017-06-05 9:07 ` [tip:locking/core] tools/lib/lockdep: Fix " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 13/21] tools: liblockdep: Fix object file paths used in an out-of-tree build Levin, Alexander (Sasha Levin)
2017-06-05 9:07 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname Levin, Alexander (Sasha Levin)
2017-06-05 9:08 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 15/21] tools: liblockdep: Use LDFLAGS Levin, Alexander (Sasha Levin)
2017-06-05 9:09 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 16/21] tools include: add empty include/linux/sched/mm.h Levin, Alexander (Sasha Levin)
2017-06-05 9:09 ` [tip:locking/core] tools/include: Add (mostly) " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 17/21] tools: liblockdep: include err.h Levin, Alexander (Sasha Levin)
2017-06-05 9:10 ` [tip:locking/core] tools/lib/lockdep: Include err.h tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 18/21] tools: liblockdep: add empty __is_[module,kernel]_percpu_address Levin, Alexander (Sasha Levin)
2017-06-05 9:10 ` [tip:locking/core] tools/lib/lockdep: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h Levin, Alexander (Sasha Levin)
2017-06-05 9:11 ` [tip:locking/core] tools/include: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context() Levin, Alexander (Sasha Levin)
2017-06-05 9:11 ` [tip:locking/core] tools/lib/lockdep: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 21/21] tools: liblockdep: hide liblockdep output from test results Levin, Alexander (Sasha Levin)
2017-06-05 9:12 ` [tip:locking/core] tools/lib/lockdep: Hide " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-26 6:52 ` [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar
2017-05-26 10:57 ` Levin, Alexander (Sasha Levin)
2017-05-26 11:21 ` Ingo Molnar
2017-05-26 11:41 ` Levin, Alexander (Sasha Levin)
2017-05-28 9:11 ` Ingo Molnar
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-bb7ea2a9af4c98ed70adf7627a2ba5d1ff1725e0@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ben@decadent.org.uk \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sasha.levin@oracle.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).