lkml.org 
[lkml]   [2011]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH v2 02/20] move get_jiffies_64 to kernel/time/jiffies.c
From
Date
in order to make the xtime_lock local to kernel/time
all users of this lock need to be moved there.

Signed-off-by: Torben Hohn <torbenh@gmx.de>
---
kernel/time.c | 17 -----------------
kernel/time/jiffies.c | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/kernel/time.c b/kernel/time.c
index 55337a8..9c72ba5 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -693,23 +693,6 @@ unsigned long nsecs_to_jiffies(u64 n)
return (unsigned long)nsecs_to_jiffies64(n);
}

-#if (BITS_PER_LONG < 64)
-u64 get_jiffies_64(void)
-{
- unsigned long seq;
- u64 ret;
-
- do {
- seq = read_seqbegin(&xtime_lock);
- ret = jiffies_64;
- } while (read_seqretry(&xtime_lock, seq));
- return ret;
-}
-EXPORT_SYMBOL(get_jiffies_64);
-#endif
-
-EXPORT_SYMBOL(jiffies);
-
/*
* Add two timespec values and do a safety check for overflow.
* It's assumed that both values are valid (>= 0)
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 5404a84..54441c4 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -64,6 +64,23 @@ struct clocksource clocksource_jiffies = {
.shift = JIFFIES_SHIFT,
};

+#if (BITS_PER_LONG < 64)
+u64 get_jiffies_64(void)
+{
+ unsigned long seq;
+ u64 ret;
+
+ do {
+ seq = read_seqbegin(&xtime_lock);
+ ret = jiffies_64;
+ } while (read_seqretry(&xtime_lock, seq));
+ return ret;
+}
+EXPORT_SYMBOL(get_jiffies_64);
+#endif
+
+EXPORT_SYMBOL(jiffies);
+
static int __init init_jiffies_clocksource(void)
{
return clocksource_register(&clocksource_jiffies);


\
 
 \ /
  Last update: 2011-01-27 16:01    [from the cache]
©2003-2011 Jasper Spaans