---

yaml --- r: 99526 b: refs/heads/master c: c2c14fb h: refs/heads/master v: v3
git-mirror · May 25, 2008 · 2d9145b · 2d9145b
1 parent 59cf409
commit 2d9145b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0748aca6f0af917591dcfd70dccac770a25d4f71
+refs/heads/master: c2c14fb7afcc67b48724571506e095fccc65a670
diff --git a/trunk/arch/x86/kernel/tsc_64.c b/trunk/arch/x86/kernel/tsc_64.c
@@ -242,7 +242,7 @@ void __init tsc_calibrate(void)
 	if (hpet) {
 		printk(KERN_INFO "TSC calibrated against HPET\n");
 		if (hpet2 < hpet1)
-			hpet2 += 0x100000000;
+			hpet2 += 0x100000000UL;
 		hpet2 -= hpet1;
 		tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000;
 	} else {