Skip to content

Commit

Permalink
time: Move get_jiffies_64 to kernel/time/jiffies.c
Browse files Browse the repository at this point in the history
Move the jiffies access functions to the jiffies clocksource code.

[ tglx: Add missing include ]

Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: yong.zhang0@gmail.com
Cc: hch@infradead.org
LKML-Reference: <20110127145900.23248.73352.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Torben Hohn authored and Thomas Gleixner committed Jan 31, 2011
1 parent 871cf1e commit fbad1ea
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
17 changes: 0 additions & 17 deletions kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -674,23 +674,6 @@ unsigned long nsecs_to_jiffies(u64 n)
#endif
}

#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)
Expand Down
18 changes: 18 additions & 0 deletions kernel/time/jiffies.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
************************************************************************/
#include <linux/clocksource.h>
#include <linux/jiffies.h>
#include <linux/module.h>
#include <linux/init.h>

/* The Jiffies based clocksource is the lowest common
Expand Down Expand Up @@ -64,6 +65,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);
Expand Down

0 comments on commit fbad1ea

Please sign in to comment.