---

yaml --- r: 175434 b: refs/heads/master c: 1bbfa6f h: refs/heads/master v: v3
git-mirror · Dec 10, 2009 · c7a99ad · c7a99ad
1 parent 4ba391b
commit c7a99ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3786310afe738070be31c439b8deeaeb69b9735d
+refs/heads/master: 1bbfa6f25673019dc0acc9308b667c96f6cda8bf
diff --git a/trunk/include/linux/sched.h b/trunk/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);