From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932157AbcFJJbx (ORCPT ); Fri, 10 Jun 2016 05:31:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48580 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbcFJJbv (ORCPT ); Fri, 10 Jun 2016 05:31:51 -0400 Date: Fri, 10 Jun 2016 02:31:30 -0700 From: tip-bot for Pratyush Patel Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, pratyushpatel.1995@gmail.com, hpa@zytor.com Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, pratyushpatel.1995@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <20160301172849.GA18152@cyborg> References: <20160301172849.GA18152@cyborg> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Remove redundant #ifdef block Git-Commit-ID: 86721ab63b61ef1dd7305308e4049f644703decf 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: 86721ab63b61ef1dd7305308e4049f644703decf Gitweb: http://git.kernel.org/tip/86721ab63b61ef1dd7305308e4049f644703decf Author: Pratyush Patel AuthorDate: Tue, 1 Mar 2016 22:58:49 +0530 Committer: Thomas Gleixner 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 Link: http://lkml.kernel.org/r/20160301172849.GA18152@cyborg Signed-off-by: Thomas Gleixner --- 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)