From: tip-bot for Sasha Levin <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org,
sasha.levin@oracle.com, hpa@zytor.com,
torvalds@linux-foundation.org, peterz@infradead.org,
mingo@kernel.org
Subject: [tip:locking/urgent] tools/liblockdep: Correct macro for WARN
Date: Tue, 25 Aug 2015 00:48:55 -0700 [thread overview]
Message-ID: <tip-62b989de598c486df65a14dfd9bb4a9953c75568@git.kernel.org> (raw)
In-Reply-To: <1440479985-6696-2-git-send-email-sasha.levin@oracle.com>
Commit-ID: 62b989de598c486df65a14dfd9bb4a9953c75568
Gitweb: http://git.kernel.org/tip/62b989de598c486df65a14dfd9bb4a9953c75568
Author: Sasha Levin <sasha.levin@oracle.com>
AuthorDate: Tue, 25 Aug 2015 01:19:44 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 25 Aug 2015 09:44:22 +0200
tools/liblockdep: Correct macro for WARN
As Peter Zijlstra pointed out, the varargs for WARN() are
optional, so we need to correctly handle the case where they
don't exist.
This would cause a compilation error.
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>
Link: http://lkml.kernel.org/r/1440479985-6696-2-git-send-email-sasha.levin@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index cd2cc59..276c7a8 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -23,7 +23,7 @@
#define WARN_ON(x) (x)
#define WARN_ON_ONCE(x) (x)
#define likely(x) (x)
-#define WARN(x, y, z) (x)
+#define WARN(x, y...) (x)
#define uninitialized_var(x) x
#define __init
#define noinline
next prev parent reply other threads:[~2015-08-25 7:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-25 5:19 [PATCH 1/3] tools: restore export.h Sasha Levin
2015-08-25 5:19 ` [PATCH 2/3] tools/liblockdep: correct macro for WARN Sasha Levin
2015-08-25 7:48 ` tip-bot for Sasha Levin [this message]
2015-08-25 5:19 ` [PATCH 3/3] tools/liblockdep: use the rbtree header provided by common tools headers Sasha Levin
2015-08-25 7:49 ` [tip:locking/urgent] tools/liblockdep: Use " tip-bot for Sasha Levin
2015-08-25 7:48 ` [tip:locking/urgent] tools: Restore export.h tip-bot for Sasha Levin
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-62b989de598c486df65a14dfd9bb4a9953c75568@git.kernel.org \
--to=tipbot@zytor.com \
--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