From fbd27814fa8b2403d21b16b5e271ad81b684de53 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Sun, 30 Oct 2005 15:03:41 -0800 Subject: [PATCH] --- yaml --- r: 11912 b: refs/heads/master c: 318db8f03bc06e6de98e98a568b6b2fa64233b87 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/hpet.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f4a8a29578f9..565025817a4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c860ed9fb5d320407f99190ab2e31bfe74db6724 +refs/heads/master: 318db8f03bc06e6de98e98a568b6b2fa64233b87 diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c index cf325622b396..0159c463f0f9 100644 --- a/trunk/drivers/char/hpet.c +++ b/trunk/drivers/char/hpet.c @@ -798,7 +798,7 @@ int hpet_alloc(struct hpet_data *hdp) size_t siz; struct hpet __iomem *hpet; static struct hpets *last = (struct hpets *)0; - unsigned long ns, period; + unsigned long period; unsigned long long temp; /* @@ -863,10 +863,9 @@ int hpet_alloc(struct hpet_data *hdp) printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); printk("\n"); - ns = period / 1000000; /* convert to nanoseconds, 10^-9 */ - printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n", - hpetp->hp_which, ns, hpetp->hp_ntimer, - cap & HPET_COUNTER_SIZE_MASK ? 64 : 32); + printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n", + hpetp->hp_which, hpetp->hp_ntimer, + cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp->hp_tick_freq); mcfg = readq(&hpet->hpet_config); if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {