diff options
author | David Brownell <david-b@pacbell.net> | 2008-07-31 15:59:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 16:49:58 -0400 |
commit | f92a789d259eb95afe7498ff5938fe2a93d39c82 (patch) | |
tree | 2bf403eb7970d608d55639cd19fff14ca2ca0839 /drivers/char/hpet.c | |
parent | 64a76f667d987a559ad0726b4692c987800b22bc (diff) |
hpet: /dev/hpet - fixes and cleanup, fix
fix:
On Thursday 31 July 2008, Ingo Molnar wrote:
> drivers/built-in.o: In function `hpet_alloc':
> : undefined reference to `__udivdi3'
> drivers/built-in.o: In function `hpet_alloc':
> : undefined reference to `__umoddi3'
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/hpet.c')
-rw-r--r-- | drivers/char/hpet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 4bc1da4d4f80..2908a0eb63af 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -764,6 +764,7 @@ int hpet_alloc(struct hpet_data *hdp) | |||
764 | static struct hpets *last = NULL; | 764 | static struct hpets *last = NULL; |
765 | unsigned long period; | 765 | unsigned long period; |
766 | unsigned long long temp; | 766 | unsigned long long temp; |
767 | u32 remainder; | ||
767 | 768 | ||
768 | /* | 769 | /* |
769 | * hpet_alloc can be called by platform dependent code. | 770 | * hpet_alloc can be called by platform dependent code. |
@@ -827,12 +828,13 @@ int hpet_alloc(struct hpet_data *hdp) | |||
827 | printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); | 828 | printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]); |
828 | printk("\n"); | 829 | printk("\n"); |
829 | 830 | ||
831 | temp = hpetp->hp_tick_freq; | ||
832 | remainder = do_div(temp, 1000000); | ||
830 | printk(KERN_INFO | 833 | printk(KERN_INFO |
831 | "hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n", | 834 | "hpet%u: %u comparators, %d-bit %u.%06u MHz counter\n", |
832 | hpetp->hp_which, hpetp->hp_ntimer, | 835 | hpetp->hp_which, hpetp->hp_ntimer, |
833 | cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, | 836 | cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, |
834 | (unsigned) (hpetp->hp_tick_freq / 1000000), | 837 | (unsigned) temp, remainder); |
835 | (unsigned) (hpetp->hp_tick_freq % 1000000)); | ||
836 | 838 | ||
837 | mcfg = readq(&hpet->hpet_config); | 839 | mcfg = readq(&hpet->hpet_config); |
838 | if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) { | 840 | if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) { |