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

Commit e7038f8e authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Greg Kroah-Hartman
Browse files

time: Introduce jiffies64_to_nsecs() 



commit 07e5f5e353aaa61696c8353d87050994a0c4648a upstream.

This will be needed for the cputime_t to nsec conversion.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-2-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarIvan Delalande <colona@arista.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ab072189

include/linux/jiffies.h

+2 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ static inline u64 jiffies_to_nsecs(const unsigned long j) 
	return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;

}



extern u64 jiffies64_to_nsecs(u64 j);



extern unsigned long __msecs_to_jiffies(const unsigned int m);

#if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)

/*

kernel/time/time.c

+10 −0
Original line number Diff line number Diff line
@@ -704,6 +704,16 @@ u64 nsec_to_clock_t(u64 x) 
#endif

}



u64 jiffies64_to_nsecs(u64 j)

{

#if !(NSEC_PER_SEC % HZ)

	return (NSEC_PER_SEC / HZ) * j;

# else

	return div_u64(j * HZ_TO_NSEC_NUM, HZ_TO_NSEC_DEN);

#endif

}

EXPORT_SYMBOL(jiffies64_to_nsecs);



/**

 * nsecs_to_jiffies64 - Convert nsecs in u64 to jiffies64

 *

kernel/time/timeconst.bc

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ define timeconst(hz) { 
		print "#define HZ_TO_USEC_DEN\t\t", hz/cd, "\n"

		print "#define USEC_TO_HZ_NUM\t\t", hz/cd, "\n"

		print "#define USEC_TO_HZ_DEN\t\t", 1000000/cd, "\n"



		cd=gcd(hz,1000000000)

		print "#define HZ_TO_NSEC_NUM\t\t", 1000000000/cd, "\n"

		print "#define HZ_TO_NSEC_DEN\t\t", hz/cd, "\n"

		print "#define NSEC_TO_HZ_NUM\t\t", hz/cd, "\n"

		print "#define NSEC_TO_HZ_DEN\t\t", 1000000000/cd, "\n"

		print "\n"



		print "#endif /* KERNEL_TIMECONST_H */\n"