From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753046AbcD1K3m (ORCPT ); Thu, 28 Apr 2016 06:29:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47092 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752462AbcD1K3k (ORCPT ); Thu, 28 Apr 2016 06:29:40 -0400 Date: Thu, 28 Apr 2016 03:29:09 -0700 From: "tip-bot for Paul E. McKenney" Message-ID: Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, paulmck@linux.vnet.ibm.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1461691328-5429-4-git-send-email-paulmck@linux.vnet.ibm.com> References: <1461691328-5429-4-git-send-email-paulmck@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] lcoking/locktorture: Simplify the torture_runnable computation Git-Commit-ID: 5db4298133d99b3dfc60d6899ac9df169769c899 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: 5db4298133d99b3dfc60d6899ac9df169769c899 Gitweb: http://git.kernel.org/tip/5db4298133d99b3dfc60d6899ac9df169769c899 Author: Paul E. McKenney AuthorDate: Tue, 26 Apr 2016 10:22:08 -0700 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 10:57:51 +0200 lcoking/locktorture: Simplify the torture_runnable computation This commit replaces an #ifdef with IS_ENABLED(), saving five lines. Signed-off-by: Paul E. McKenney Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: corbet@lwn.net Cc: dave@stgolabs.net Cc: dhowells@redhat.com Cc: linux-doc@vger.kernel.org Cc: will.deacon@arm.com Link: http://lkml.kernel.org/r/1461691328-5429-4-git-send-email-paulmck@linux.vnet.ibm.com Signed-off-by: Ingo Molnar --- kernel/locking/locktorture.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index d066a50..f8c5af5 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -75,12 +75,7 @@ struct lock_stress_stats { long n_lock_acquired; }; -#if defined(MODULE) -#define LOCKTORTURE_RUNNABLE_INIT 1 -#else -#define LOCKTORTURE_RUNNABLE_INIT 0 -#endif -int torture_runnable = LOCKTORTURE_RUNNABLE_INIT; +int torture_runnable = IS_ENABLED(MODULE); module_param(torture_runnable, int, 0444); MODULE_PARM_DESC(torture_runnable, "Start locktorture at module init");