From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755400AbbHYHt3 (ORCPT ); Tue, 25 Aug 2015 03:49:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38452 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753396AbbHYHt1 (ORCPT ); Tue, 25 Aug 2015 03:49:27 -0400 Date: Tue, 25 Aug 2015 00:48:55 -0700 From: tip-bot for Sasha Levin Message-ID: 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 Reply-To: sasha.levin@oracle.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, hpa@zytor.com In-Reply-To: <1440479985-6696-2-git-send-email-sasha.levin@oracle.com> References: <1440479985-6696-2-git-send-email-sasha.levin@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] tools/liblockdep: Correct macro for WARN Git-Commit-ID: 62b989de598c486df65a14dfd9bb4a9953c75568 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 62b989de598c486df65a14dfd9bb4a9953c75568 Gitweb: http://git.kernel.org/tip/62b989de598c486df65a14dfd9bb4a9953c75568 Author: Sasha Levin AuthorDate: Tue, 25 Aug 2015 01:19:44 -0400 Committer: Ingo Molnar 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 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1440479985-6696-2-git-send-email-sasha.levin@oracle.com Signed-off-by: Ingo Molnar --- 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