Commit 6f6d6a1a authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

rename div64_64 to div64_u64 



Rename div64_64 to div64_u64 to make it consistent with the other divide
functions, so it clearly includes the type of the divide.  Move its definition
to math64.h as currently no architecture overrides the generic implementation.
 They can still override it of course, but the duplicated declarations are
avoided.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Cc: Avi Kivity <avi@qumranet.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71abb3af

arch/ia64/kvm/kvm-ia64.c

+1 −2
Original line number Diff line number Diff line 


/*

 * kvm_ia64.c: Basic KVM suppport On Itanium series processors

 *
@@ -431,7 +430,7 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu) 
	if (itc_diff < 0)

		itc_diff = -itc_diff;



	expires = div64_64(itc_diff, cyc_per_usec);

	expires = div64_u64(itc_diff, cyc_per_usec);

	kt = ktime_set(0, 1000 * expires);

	vcpu->arch.ht_active = 1;

	hrtimer_start(p_ht, kt, HRTIMER_MODE_ABS);

arch/x86/kvm/i8254.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "i8254.h"



#ifndef CONFIG_X86_64

#define mod_64(x, y) ((x) - (y) * div64_64(x, y))

#define mod_64(x, y) ((x) - (y) * div64_u64(x, y))

#else

#define mod_64(x, y) ((x) % (y))

#endif
@@ -60,8 +60,8 @@ static u64 muldiv64(u64 a, u32 b, u32 c) 
	rl = (u64)u.l.low * (u64)b;

	rh = (u64)u.l.high * (u64)b;

	rh += (rl >> 32);

	res.l.high = div64_64(rh, c);

	res.l.low = div64_64(((mod_64(rh, c) << 32) + (rl & 0xffffffff)), c);

	res.l.high = div64_u64(rh, c);

	res.l.low = div64_u64(((mod_64(rh, c) << 32) + (rl & 0xffffffff)), c);

	return res.ll;

}

arch/x86/kvm/lapic.c

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 
#include <linux/hrtimer.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/math64.h>

#include <asm/processor.h>

#include <asm/msr.h>

#include <asm/page.h>

#include <asm/current.h>

#include <asm/apicdef.h>

#include <asm/atomic.h>

#include <asm/div64.h>

#include "irq.h"



#define PRId64 "d"
@@ -526,7 +526,7 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic) 
	} else

		passed = ktime_sub(now, apic->timer.last_update);



	counter_passed = div64_64(ktime_to_ns(passed),

	counter_passed = div64_u64(ktime_to_ns(passed),

				   (APIC_BUS_CYCLE_NS * apic->timer.divide_count));



	if (counter_passed > tmcct) {

include/asm-arm/div64.h

+0 −2
Original line number Diff line number Diff line
@@ -224,6 +224,4 @@ 


#endif



extern uint64_t div64_64(uint64_t dividend, uint64_t divisor);



#endif

include/asm-generic/div64.h

+0 −7
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ 
	__rem;							\

 })



static inline uint64_t div64_64(uint64_t dividend, uint64_t divisor)

{

	return dividend / divisor;

}



#elif BITS_PER_LONG == 32



extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
@@ -54,8 +49,6 @@ extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor); 
	__rem;						\

 })



extern uint64_t div64_64(uint64_t dividend, uint64_t divisor);



#else /* BITS_PER_LONG == ?? */



# error do_div() does not yet support the C64

CRA Git | Maintained and supported by SUSTech CRA and CCSE