From: "tip-bot for Paul E. McKenney" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:locking/core] lcoking/locktorture: Simplify the torture_runnable computation
Date: Thu, 28 Apr 2016 03:29:09 -0700 [thread overview]
Message-ID: <tip-5db4298133d99b3dfc60d6899ac9df169769c899@git.kernel.org> (raw)
In-Reply-To: <1461691328-5429-4-git-send-email-paulmck@linux.vnet.ibm.com>
Commit-ID: 5db4298133d99b3dfc60d6899ac9df169769c899
Gitweb: http://git.kernel.org/tip/5db4298133d99b3dfc60d6899ac9df169769c899
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
AuthorDate: Tue, 26 Apr 2016 10:22:08 -0700
Committer: Ingo Molnar <mingo@kernel.org>
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 <paulmck@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@kernel.org>
---
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");
prev parent reply other threads:[~2016-04-28 10:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 17:20 [PATCH locking 0/4] locktorture and memory-barriers.txt updates Paul E. McKenney
2016-04-26 17:22 ` [PATCH locking 1/4] documentation: Add disclaimer Paul E. McKenney
2016-04-28 10:27 ` [tip:locking/core] locking/Documentation: " tip-bot for Peter Zijlstra
2016-04-26 17:22 ` [PATCH locking 2/4] documentation: State purpose of memory-barriers.txt Paul E. McKenney
2016-04-28 10:28 ` [tip:locking/core] locking/Documentation: " tip-bot for David Howells
2016-04-26 17:22 ` [PATCH locking 3/4] documentation: ACQUIRE applies to loads, RELEASE applies to stores Paul E. McKenney
2016-04-28 10:28 ` [tip:locking/core] locking/Documentation: Clarify that " tip-bot for Will Deacon
2016-04-26 17:22 ` [PATCH locking 4/4] locktorture: Simplify torture_runnable computation Paul E. McKenney
2016-04-28 10:29 ` tip-bot for Paul E. McKenney [this message]
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-5db4298133d99b3dfc60d6899ac9df169769c899@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=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--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