From f11c1a3c7847bf48a812eb7eb79a071e772d9973 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Thu, 31 Jul 2008 12:59:56 -0700
Subject: [PATCH] --- yaml --- r: 113615 b: refs/heads/master c:
 f92a789d259eb95afe7498ff5938fe2a93d39c82 h: refs/heads/master i:   113613:
 e4361d71de7818085ee4939f3857ffd48710d64d   113611:
 cb7a970c7028c6d8b65b0344b5dc78d10455992b   113607:
 d70ecdf37e82fa89a80e594c554dc8d43533a699   113599:
 d366e2e12f5b097c169856f13cbd595db60f0ff0 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/hpet.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 73786e7b2f5f..0c6b8aea294d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64a76f667d987a559ad0726b4692c987800b22bc
+refs/heads/master: f92a789d259eb95afe7498ff5938fe2a93d39c82
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index 4bc1da4d4f80..2908a0eb63af 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -764,6 +764,7 @@ int hpet_alloc(struct hpet_data *hdp)
 	static struct hpets *last = NULL;
 	unsigned long period;
 	unsigned long long temp;
+	u32 remainder;
 
 	/*
 	 * hpet_alloc can be called by platform dependent code.
@@ -827,12 +828,13 @@ int hpet_alloc(struct hpet_data *hdp)
 		printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
 	printk("\n");
 
+	temp = hpetp->hp_tick_freq;
+	remainder = do_div(temp, 1000000);
 	printk(KERN_INFO
 		"hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n",
 		hpetp->hp_which, hpetp->hp_ntimer,
 		cap & HPET_COUNTER_SIZE_MASK ? 64 : 32,
-		(unsigned) (hpetp->hp_tick_freq / 1000000),
-		(unsigned) (hpetp->hp_tick_freq % 1000000));
+		(unsigned) temp, remainder);
 
 	mcfg = readq(&hpet->hpet_config);
 	if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {