Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbad1ea9 authored by Torben Hohn's avatar Torben Hohn Committed by Thomas Gleixner
Browse files

time: Move get_jiffies_64 to kernel/time/jiffies.c 



Move the jiffies access functions to the jiffies clocksource code.

[ tglx: Add missing include ]

Signed-off-by: default avatarTorben 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 871cf1e5

kernel/time.c

+0 −17
Original line number Diff line number Diff line
@@ -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)

kernel/time/jiffies.c

+18 −0
Original line number Diff line number Diff line
@@ -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
@@ -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);