summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-12-09 20:07:03 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-10 08:30:27 +0100
commit1bbfa6f25673019dc0acc9308b667c96f6cda8bf (patch)
treed6a49eaf657c7981e2734758fbb50e2265997c37 /include
parent3786310afe738070be31c439b8deeaeb69b9735d (diff)
downloadlinux-stable-1bbfa6f25673019dc0acc9308b667c96f6cda8bf.tar.gz
linux-stable-1bbfa6f25673019dc0acc9308b667c96f6cda8bf.tar.bz2
linux-stable-1bbfa6f25673019dc0acc9308b667c96f6cda8bf.zip
sched: Mark sched_clock() as notrace
The core ftrace code (trace_clock_local) calls sched_clock() directly, so we don't want to recurisvely trigger the ftrace code. Rather than update every sched_clock() definition, tag the prototype for everyone as notrace. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <1260407223-10900-1-git-send-email-vapier@gentoo.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 75e6e60bf583..576d838adf68 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1836,7 +1836,8 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
extern int sched_clock_stable;
#endif
-extern unsigned long long sched_clock(void);
+/* ftrace calls sched_clock() directly */
+extern unsigned long long notrace sched_clock(void);
extern void sched_clock_init(void);
extern u64 sched_clock_cpu(int cpu);