From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbdANMxR (ORCPT ); Sat, 14 Jan 2017 07:53:17 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52472 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311AbdANMxQ (ORCPT ); Sat, 14 Jan 2017 07:53:16 -0500 Date: Sat, 14 Jan 2017 04:52:17 -0800 From: tip-bot for Chris Wilson Message-ID: Cc: akpm@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, maarten.lankhorst@canonical.com, paulmck@linux.vnet.ibm.com, chris@chris-wilson.co.uk, linux-kernel@vger.kernel.org Reply-To: maarten.lankhorst@canonical.com, torvalds@linux-foundation.org, peterz@infradead.org, linux-kernel@vger.kernel.org, chris@chris-wilson.co.uk, paulmck@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, akpm@linux-foundation.org, mingo@kernel.org In-Reply-To: <20161201114711.28697-2-chris@chris-wilson.co.uk> References: <20161201114711.28697-2-chris@chris-wilson.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/ww_mutex: Fix compilation of __WW_MUTEX_INITIALIZER Git-Commit-ID: af2e859edd477fa1ea3d1d106f41a595cff3d162 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: af2e859edd477fa1ea3d1d106f41a595cff3d162 Gitweb: http://git.kernel.org/tip/af2e859edd477fa1ea3d1d106f41a595cff3d162 Author: Chris Wilson AuthorDate: Thu, 1 Dec 2016 11:47:04 +0000 Committer: Ingo Molnar CommitDate: Sat, 14 Jan 2017 11:37:13 +0100 locking/ww_mutex: Fix compilation of __WW_MUTEX_INITIALIZER >>From conflicting macro parameters, passing the wrong name to __MUTEX_INITIALIZER and a stray '\', #define __WW_MUTEX_INITIALIZER was very unhappy. One unnecessary change was to choose to pass &ww_class instead of implicitly taking the address of the class within the macro. Signed-off-by: Chris Wilson Signed-off-by: Peter Zijlstra (Intel) Cc: Andrew Morton Cc: Linus Torvalds Cc: Maarten Lankhorst Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 1b375dc30710 ("mutex: Move ww_mutex definitions to ww_mutex.h") Link: http://lkml.kernel.org/r/20161201114711.28697-2-chris@chris-wilson.co.uk Signed-off-by: Ingo Molnar --- include/linux/ww_mutex.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h index c075285..083950f 100644 --- a/include/linux/ww_mutex.h +++ b/include/linux/ww_mutex.h @@ -51,10 +51,10 @@ struct ww_mutex { }; #ifdef CONFIG_DEBUG_LOCK_ALLOC -# define __WW_CLASS_MUTEX_INITIALIZER(lockname, ww_class) \ - , .ww_class = &ww_class +# define __WW_CLASS_MUTEX_INITIALIZER(lockname, class) \ + , .ww_class = class #else -# define __WW_CLASS_MUTEX_INITIALIZER(lockname, ww_class) +# define __WW_CLASS_MUTEX_INITIALIZER(lockname, class) #endif #define __WW_CLASS_INITIALIZER(ww_class) \ @@ -63,7 +63,7 @@ struct ww_mutex { , .mutex_name = #ww_class "_mutex" } #define __WW_MUTEX_INITIALIZER(lockname, class) \ - { .base = { \__MUTEX_INITIALIZER(lockname) } \ + { .base = __MUTEX_INITIALIZER(lockname.base) \ __WW_CLASS_MUTEX_INITIALIZER(lockname, class) } #define DEFINE_WW_CLASS(classname) \