summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2015-03-26 12:23:25 -0700
committerIngo Molnar <mingo@kernel.org>2015-03-27 08:33:59 +0100
commit9fee69a8c8070b38b558161a3f18bd5e2b664682 (patch)
tree35a7b80b8b71e961cf52ff5657e8b731f69a8e58 /kernel/time
parent13dbeb384d2d3aa555ea48d511e8cb110bd172e0 (diff)
downloadlinux-9fee69a8c8070b38b558161a3f18bd5e2b664682.tar.bz2
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 <daniel.thompson@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/1427397806-20889-5-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/sched_clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index 52ea5d976393..8adb9d0c969a 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;