diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 08:38:30 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 08:38:30 (GMT) |
commit | 39675e89fb472c1b9c8e740e00acb1df2bbc6be7 (patch) | |
tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /kernel/sched_clock.c | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
download | linux-fsl-qoriq-39675e89fb472c1b9c8e740e00acb1df2bbc6be7.tar.xz |
Merge branch 'sched/urgent' into sched/clock
Diffstat (limited to 'kernel/sched_clock.c')
-rw-r--r-- | kernel/sched_clock.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c index 22ed55d..5a2dc7d 100644 --- a/kernel/sched_clock.c +++ b/kernel/sched_clock.c @@ -32,6 +32,15 @@ #include <linux/ktime.h> #include <linux/module.h> +/* + * Scheduler clock - returns current time in nanosec units. + * This is default implementation. + * Architectures and sub-architectures can override this. + */ +unsigned long long __attribute__((weak)) sched_clock(void) +{ + return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ); +} #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK @@ -321,16 +330,6 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event); #endif -/* - * Scheduler clock - returns current time in nanosec units. - * This is default implementation. - * Architectures and sub-architectures can override this. - */ -unsigned long long __attribute__((weak)) sched_clock(void) -{ - return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ); -} - unsigned long long cpu_clock(int cpu) { unsigned long long clock; |