Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599AbbHRQjm (ORCPT ); Tue, 18 Aug 2015 12:39:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38689 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752754AbbHRQjk (ORCPT ); Tue, 18 Aug 2015 12:39:40 -0400 Date: Tue, 18 Aug 2015 09:39:29 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: fweisbec@gmail.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: fweisbec@gmail.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1439907509-9553-2-git-send-email-fweisbec@gmail.com> References: <1439907509-9553-2-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Simplify get_target_base() by returning current base Git-Commit-ID: 662b3e194656cc713d51d52780fb71f499c46619 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 Content-Length: 1612 Lines: 46 Commit-ID: 662b3e194656cc713d51d52780fb71f499c46619 Gitweb: http://git.kernel.org/tip/662b3e194656cc713d51d52780fb71f499c46619 Author: Frederic Weisbecker AuthorDate: Tue, 18 Aug 2015 16:18:28 +0200 Committer: Thomas Gleixner CommitDate: Tue, 18 Aug 2015 18:36:59 +0200 hrtimer: Simplify get_target_base() by returning current base Instead of fetching again the current cpu base, just take it from the parameter. Signed-off-by: Frederic Weisbecker Link: http://lkml.kernel.org/r/1439907509-9553-2-git-send-email-fweisbec@gmail.com Signed-off-by: Thomas Gleixner --- kernel/time/hrtimer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 55575d4..f9eb21b 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -183,7 +183,7 @@ struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base, int pinned) { if (pinned || !base->migration_enabled) - return this_cpu_ptr(&hrtimer_bases); + return base; return &per_cpu(hrtimer_bases, get_nohz_timer_target()); } #else @@ -191,7 +191,7 @@ static inline struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base, int pinned) { - return this_cpu_ptr(&hrtimer_bases); + return base; } #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/