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

Commit 50933623 authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: x86: Fix constant type in kvm_get_time_scale 



Older gcc versions complain about the improper type (for x86-32), 4.5
seems to fix this silently. However, we should better use the right type
initially.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 07d6f555

arch/x86/kvm/x86.c

+3 −3
Original line number Diff line number Diff line
@@ -930,14 +930,14 @@ static void kvm_get_time_scale(uint32_t scaled_khz, uint32_t base_khz, 


	tps64 = base_khz * 1000LL;

	scaled64 = scaled_khz * 1000LL;

	while (tps64 > scaled64*2 || tps64 & 0xffffffff00000000UL) {

	while (tps64 > scaled64*2 || tps64 & 0xffffffff00000000ULL) {

		tps64 >>= 1;

		shift--;

	}



	tps32 = (uint32_t)tps64;

	while (tps32 <= scaled64 || scaled64 & 0xffffffff00000000UL) {

		if (scaled64 & 0xffffffff00000000UL || tps32 & 0x80000000)

	while (tps32 <= scaled64 || scaled64 & 0xffffffff00000000ULL) {

		if (scaled64 & 0xffffffff00000000ULL || tps32 & 0x80000000)

			scaled64 >>= 1;

		else

			tps32 <<= 1;