Groups > linux.kernel > #1419153

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

Path	csiph.com!news.mixmin.net!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	tip-bot for Pratyush Patel <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:timers/core] hrtimer: Remove redundant #ifdef block
Date	Fri, 10 Jun 2016 11:40:02 +0200
Message-ID	<rIr50-2Pg-5@gated-at.bofh.it> (permalink)
References	<r7Wr7-3Ko-1@gated-at.bofh.it>
X-Original-To	linux-tip-commits@vger.kernel.org
Reply-To	tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, pratyushpatel.1995@gmail.com, linux-kernel@vger.kernel.org
Git-Commit-ID	86721ab63b61ef1dd7305308e4049f644703decf
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> 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	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	32
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, pratyushpatel.1995@gmail.com, hpa@zytor.com
X-Original-Date	Fri, 10 Jun 2016 02:31:30 -0700
X-Original-Message-ID	<tip-86721ab63b61ef1dd7305308e4049f644703decf@git.kernel.org>
X-Original-References	<20160301172849.GA18152@cyborg>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1419153

Show key headers only | View raw

Commit-ID:  86721ab63b61ef1dd7305308e4049f644703decf
Gitweb:     http://git.kernel.org/tip/86721ab63b61ef1dd7305308e4049f644703decf
Author:     Pratyush Patel <pratyushpatel.1995@gmail.com>
AuthorDate: Tue, 1 Mar 2016 22:58:49 +0530
Committer:  Thomas Gleixner <tglx@linutronix.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@gmail.com>
Link: http://lkml.kernel.org/r/20160301172849.GA18152@cyborg
Signed-off-by: Thomas Gleixner <tglx@linutronix.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)

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[tip:timers/core] hrtimer: Remove redundant #ifdef block tip-bot for Pratyush Patel <tipbot@zytor.com> - 2016-06-10 11:40 +0200

csiph-web