aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time.c17
-rw-r--r--kernel/time/jiffies.c18
2 files changed, 18 insertions, 17 deletions
diff --git a/kernel/time.c b/kernel/time.c
index 32174359576f..a31b51220ac6 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -674,23 +674,6 @@ unsigned long nsecs_to_jiffies(u64 n)
674#endif 674#endif
675} 675}
676 676
677#if (BITS_PER_LONG < 64)
678u64 get_jiffies_64(void)
679{
680 unsigned long seq;
681 u64 ret;
682
683 do {
684 seq = read_seqbegin(&xtime_lock);
685 ret = jiffies_64;
686 } while (read_seqretry(&xtime_lock, seq));
687 return ret;
688}
689EXPORT_SYMBOL(get_jiffies_64);
690#endif
691
692EXPORT_SYMBOL(jiffies);
693
694/* 677/*
695 * Add two timespec values and do a safety check for overflow. 678 * Add two timespec values and do a safety check for overflow.
696 * It's assumed that both values are valid (>= 0) 679 * It's assumed that both values are valid (>= 0)
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 5404a8456909..2fbc20744797 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -22,6 +22,7 @@
22************************************************************************/ 22************************************************************************/
23#include <linux/clocksource.h> 23#include <linux/clocksource.h>
24#include <linux/jiffies.h> 24#include <linux/jiffies.h>
25#include <linux/module.h>
25#include <linux/init.h> 26#include <linux/init.h>
26 27
27/* The Jiffies based clocksource is the lowest common 28/* The Jiffies based clocksource is the lowest common
@@ -64,6 +65,23 @@ struct clocksource clocksource_jiffies = {
64 .shift = JIFFIES_SHIFT, 65 .shift = JIFFIES_SHIFT,
65}; 66};
66 67
68#if (BITS_PER_LONG < 64)
69u64 get_jiffies_64(void)
70{
71 unsigned long seq;
72 u64 ret;
73
74 do {
75 seq = read_seqbegin(&xtime_lock);
76 ret = jiffies_64;
77 } while (read_seqretry(&xtime_lock, seq));
78 return ret;
79}
80EXPORT_SYMBOL(get_jiffies_64);
81#endif
82
83EXPORT_SYMBOL(jiffies);
84
67static int __init init_jiffies_clocksource(void) 85static int __init init_jiffies_clocksource(void)
68{ 86{
69 return clocksource_register(&clocksource_jiffies); 87 return clocksource_register(&clocksource_jiffies);