x86/tsc: Get rid of custom DIV_ROUND() macro (89171579) · Commits · 戴 / test

When invoced for positive values, DIV_ROUND macro defined in arch/x86/kernel/tsc.c behaves exactly like DIV_ROUND_CLOSEST from include/linux/kernel.h file, so remove the custom macro in favour of the shared one. [ hpa: changed line breaks ] Signed-off-by:

Michal Nazarewicz <mina86@mina86.com> Link: http://lkml.kernel.org/r/1403143116-21755-1-git-send-email-mina86@mina86.com Acked-by:

David Rientjes <rientjes@google.com> Signed-off-by:

H. Peter Anvin <hpa@zytor.com>

arch/x86/kernel/tsc.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -234,9 +234,6 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc)
		return ns;
		}

		/* XXX surely we already have this someplace in the kernel?! */
		#define DIV_ROUND(n, d) (((n) + ((d) / 2)) / (d))

		static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
		{
		unsigned long long tsc_now, ns_now;
		@@ -259,7 +256,9 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
		* time function is continuous; see the comment near struct
		* cyc2ns_data.
		*/
		data->cyc2ns_mul = DIV_ROUND(NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR, cpu_khz);
		data->cyc2ns_mul =
		DIV_ROUND_CLOSEST(NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR,
		cpu_khz);
		data->cyc2ns_shift = CYC2NS_SCALE_FACTOR;
		data->cyc2ns_offset = ns_now -
		mul_u64_u32_shr(tsc_now, data->cyc2ns_mul, CYC2NS_SCALE_FACTOR);

Admin message