From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753150AbcFNUs4 (ORCPT ); Tue, 14 Jun 2016 16:48:56 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:52725 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752989AbcFNUsz (ORCPT ); Tue, 14 Jun 2016 16:48:55 -0400 Date: Tue, 14 Jun 2016 21:48:53 +0100 From: Ben Hutchings To: Sasha Levin Cc: linux-kernel@vger.kernel.org Message-ID: <20160614204853.GX7555@decadent.org.uk> References: <20160614204437.GS7555@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tauoZ0QFNrdllat7" Content-Disposition: inline In-Reply-To: <20160614204437.GS7555@decadent.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@decadent.org.uk Subject: [PATCH 5/7] liblockdep: Fix 'unused value' warnings X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --tauoZ0QFNrdllat7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 --- 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/loc= kdep/uinclude/linux/debug_locks.h index f38eb64df794..1d4fbec5c649 100644 --- a/tools/lib/lockdep/uinclude/linux/debug_locks.h +++ b/tools/lib/lockdep/uinclude/linux/debug_locks.h @@ -4,7 +4,7 @@ #include #include =20 -#define DEBUG_LOCKS_WARN_ON(x) (x) +#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x) =20 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 da87bd9ad2c1..021cff4f4e3d 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; }) =20 #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 d30214221920..d1079034a14d 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); =20 #define current (__curr()) =20 -#define debug_locks_off() 1 +static inline int debug_locks_off(void) +{ + return 1; +} + #define task_pid_nr(tsk) ((tsk)->pid) =20 #define KSYM_NAME_LEN 128 --tauoZ0QFNrdllat7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBV2Bttee/yOyVhhEJAQpILQ/+NLzKeQg5kXE50JFmV23PmD0GAEhcKwms HiBBZvK5nCNkoTHGGyWuC9UeE2YWPrbpS0KIiUy4d7WHpzjtQk5UK0cKoRZ8JZo1 EHzMou5siDiUysGS64WPyAaJ9lgUHRCJU7eN5JaNBTUuoXKcU6vP8ztn2Jl9FlUd IAzyHZ1bhugOZBBVqnO7xDn7fEqrNy8i5VZ7PJT14kLHa4QzKIMzYDS9UI+6kHtA jWVTzU7bb8k4t9PqoS8ZifUjEzomr+PwgSCc+i/cReB0jOTG8XXGY7/dQ2VjZO+j uNRL9woIhyWv0mpqWpupbS/0dfchTpV32axt2VScu3gAkyWr6AAAPHOF6BywnPxR eVuEIfl/6kFfQ5hnfGU3tnUUsVZ78RhecUy76FKbQkVo7n1zGNaE3OrqUjXtxO+n wh07JYJhdoaQOXzOmL/FEVivLYvB9sxXvkHN5aUJdDr0p2tMRpzRRc+DavvOjD8n 4XnetlJoDPZmvxWTkW/XEUWw+BYXt6pL60XQM7AeMnOQqzLBKm59Q/V196fZcQ56 d52hj1c5/igeAw+iYISB+3sIEFMps8EiDeRWSD/Pk7PCYwFV5+K4yccukn7QeQCb /Ji2MSNbCrrnJFJVnLMvYLYsCd2BW+IXKBz0iS5GvFIhLzA9VplDKVOilEwIOkGy dpca7G9p8QQ= =LCsR -----END PGP SIGNATURE----- --tauoZ0QFNrdllat7--