From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753011AbbCZTYe (ORCPT ); Thu, 26 Mar 2015 15:24:34 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35071 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752513AbbCZTXh (ORCPT ); Thu, 26 Mar 2015 15:23:37 -0400 From: John Stultz To: lkml Cc: Daniel Thompson , Russell King , Will Deacon , Catalin Marinas , Thomas Gleixner , Stephen Boyd , Peter Zijlstra , Ingo Molnar , John Stultz Subject: [PATCH 4/5] sched_clock: Remove redundant notrace from update function Date: Thu, 26 Mar 2015 12:23:25 -0700 Message-Id: <1427397806-20889-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427397806-20889-1-git-send-email-john.stultz@linaro.org> References: <1427397806-20889-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Thompson 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. Cc: Russell King Cc: Will Deacon Cc: Catalin Marinas Cc: Daniel Thompson Cc: Thomas Gleixner Cc: Stephen Boyd Cc: Peter Zijlstra Cc: Ingo Molnar Reviewed-by: Stephen Boyd Acked-by: Peter Zijlstra (Intel) Signed-off-by: Daniel Thompson Signed-off-by: John Stultz --- 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; -- 1.9.1