linux-kernel - [tip:timers/core] hrtimer: Remove redundant #ifdef block

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-86721ab63b61ef1dd7305308e4049f644703decf@git.kernel.org>
Date:	Fri, 10 Jun 2016 02:31:30 -0700
From:	tip-bot for Pratyush Patel <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, mingo@...nel.org, tglx@...utronix.de,
	pratyushpatel.1995@...il.com, hpa@...or.com
Subject: [tip:timers/core] hrtimer: Remove redundant #ifdef block

Commit-ID:  86721ab63b61ef1dd7305308e4049f644703decf
Gitweb:     http://git.kernel.org/tip/86721ab63b61ef1dd7305308e4049f644703decf
Author:     Pratyush Patel <pratyushpatel.1995@...il.com>
AuthorDate: Tue, 1 Mar 2016 22:58:49 +0530
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 10 Jun 2016 11:25:35 +0200

hrtimer: Remove redundant #ifdef block

Only need CONFIG_NO_HZ_COMMON as this block is already in a
CONFIG_SMP block.

Signed-off-by: Pratyush Patel <pratyushpatel.1995@...il.com>
Link: http://lkml.kernel.org/r/20160301172849.GA18152@cyborg
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 kernel/time/hrtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index e99df0f..d13c9ae 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -177,7 +177,7 @@ hrtimer_check_target(struct hrtimer *timer, struct hrtimer_clock_base *new_base)
 #endif
 }
 
-#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
+#ifdef CONFIG_NO_HZ_COMMON
 static inline
 struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base,
 					 int pinned)