]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
timers, sched/clock: Remove redundant notrace from update function
authorDaniel Thompson <daniel.thompson@linaro.org>
Thu, 26 Mar 2015 19:23:25 +0000 (12:23 -0700)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 07:33:59 +0000 (08:33 +0100)
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>
kernel/time/sched_clock.c

index 52ea5d976393b782333cfeb1ad332d065ce999bc..8adb9d0c969aea6a2cf605935064a2b2299c10b6 100644 (file)
@@ -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;