From 9ca7985dbee87f7ea285a3de0be97c88c883d7c8 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Fri, 25 Jul 2008 19:45:00 +0100
Subject: [PATCH] --- yaml --- r: 108200 b: refs/heads/master c:
 2c3d103ba90827cfb478bf10464d9b5b9cea369c h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/sched_clock.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 08e294b21985..fea7c18af5a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e26873bb10f722f10b1af9de05119a3d7cbc07b2
+refs/heads/master: 2c3d103ba90827cfb478bf10464d9b5b9cea369c
diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c
index 22ed55d1167f..5a2dc7d8fd98 100644
--- a/trunk/kernel/sched_clock.c
+++ b/trunk/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;