From f50b3da011076e24200d2ce83e0ea209d6d36c37 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 26 Sep 2010 13:00:53 +0200
Subject: [PATCH] --- yaml --- r: 215915 b: refs/heads/master c:
 50933623e50d8730cc1a65853c153b3b4c93b629 h: refs/heads/master i:   215913:
 6dc0bf83c4bca9a5e9476769f0209b53cb502cdc   215911:
 a371a68997f5454b0dbe0e50a79f81b10b23d45e v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5740fdf19f97..82e47deb4dd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07d6f555d536aad1d74bb8b41dae9385007ecc26
+refs/heads/master: 50933623e50d8730cc1a65853c153b3b4c93b629
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index bfcf8fd5e080..ffcb90669ec5 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -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;