summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/perf_event.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-11-01 10:08:20 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-12-16 14:38:04 +0100
commit61aa4884b70cdf3b2d373e18ebbbada43789eade (patch)
treef9ebd289508847eb3d96b4b23a32d322787198ad /arch/s390/kernel/perf_event.c
parentd5b877ffb9aa04a6fb6b6eae6dc19ca163d568a8 (diff)
downloadblackbird-op-linux-61aa4884b70cdf3b2d373e18ebbbada43789eade.tar.gz
blackbird-op-linux-61aa4884b70cdf3b2d373e18ebbbada43789eade.zip
s390: use IS_ENABLED to check if a CONFIG is set to y or m
This is shorter and should be used instead of the longer form which checks for both possible config options. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/perf_event.c')
-rw-r--r--arch/s390/kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c
index 91aa215f947f..a76d602f5928 100644
--- a/arch/s390/kernel/perf_event.c
+++ b/arch/s390/kernel/perf_event.c
@@ -60,7 +60,7 @@ static bool is_in_guest(struct pt_regs *regs)
{
if (user_mode(regs))
return false;
-#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
+#if IS_ENABLED(CONFIG_KVM)
return instruction_pointer(regs) == (unsigned long) &sie_exit;
#else
return false;
OpenPOWER on IntegriCloud