From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753804AbbC0HoL (ORCPT ); Fri, 27 Mar 2015 03:44:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34211 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753779AbbC0HoH (ORCPT ); Fri, 27 Mar 2015 03:44:07 -0400 Date: Fri, 27 Mar 2015 00:42:25 -0700 From: tip-bot for Daniel Thompson Message-ID: Cc: tglx@linutronix.de, catalin.marinas@arm.com, linux@arm.linux.org.uk, mingo@kernel.org, peterz@infradead.org, john.stultz@linaro.org, sboyd@codeaurora.org, will.deacon@arm.com, daniel.thompson@linaro.org, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, daniel.thompson@linaro.org, will.deacon@arm.com, sboyd@codeaurora.org, peterz@infradead.org, john.stultz@linaro.org, mingo@kernel.org, linux@arm.linux.org.uk, catalin.marinas@arm.com, tglx@linutronix.de In-Reply-To: <1427397806-20889-5-git-send-email-john.stultz@linaro.org> References: <1427397806-20889-5-git-send-email-john.stultz@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timers, sched/clock: Remove redundant notrace from update function Git-Commit-ID: 9fee69a8c8070b38b558161a3f18bd5e2b664682 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: 9fee69a8c8070b38b558161a3f18bd5e2b664682 Gitweb: http://git.kernel.org/tip/9fee69a8c8070b38b558161a3f18bd5e2b664682 Author: Daniel Thompson AuthorDate: Thu, 26 Mar 2015 12:23:25 -0700 Committer: Ingo Molnar CommitDate: Fri, 27 Mar 2015 08:33:59 +0100 timers, sched/clock: Remove redundant notrace from update function Currently update_sched_clock() is marked as notrace but this function is not called by ftrace. This is trivially fixed by removing the mark up. Signed-off-by: Daniel Thompson Signed-off-by: John Stultz Reviewed-by: Stephen Boyd Acked-by: Peter Zijlstra (Intel) Cc: Catalin Marinas Cc: Peter Zijlstra Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Link: http://lkml.kernel.org/r/1427397806-20889-5-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar --- kernel/time/sched_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 52ea5d9..8adb9d0 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -111,7 +111,7 @@ unsigned long long notrace sched_clock(void) /* * Atomically update the sched_clock epoch. */ -static void notrace update_sched_clock(void) +static void update_sched_clock(void) { unsigned long flags; u64 cyc;