diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /include/asm-alpha | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/delay.h | 11 | ||||
| -rw-r--r-- | include/asm-alpha/smp.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-alpha/delay.h b/include/asm-alpha/delay.h index 74cb75ec2..5d3329f4d 100644 --- a/include/asm-alpha/delay.h +++ b/include/asm-alpha/delay.h @@ -2,12 +2,13 @@ #define __ALPHA_DELAY_H #include <linux/config.h> +#include <asm/param.h> #include <asm/smp.h> /* * Copyright (C) 1993, 2000 Linus Torvalds * - * Delay routines, using a pre-computed "loops_per_second" value. + * Delay routines, using a pre-computed "loops_per_jiffy" value. */ /* @@ -32,16 +33,16 @@ __delay(int loops) } extern __inline__ void -__udelay(unsigned long usecs, unsigned long lps) +__udelay(unsigned long usecs, unsigned long lpj) { - usecs *= ((1UL << 32) / 1000000) * lps; + usecs *= (((unsigned long)HZ << 32) / 1000000) * lpj; __delay((long)usecs >> 32); } #ifdef CONFIG_SMP -#define udelay(u) __udelay((u), cpu_data[smp_processor_id()].loops_per_sec) +#define udelay(u) __udelay((u), cpu_data[smp_processor_id()].loops_per_jiffy) #else -#define udelay(u) __udelay((u), loops_per_sec) +#define udelay(u) __udelay((u), loops_per_jiffy) #endif #endif /* defined(__ALPHA_DELAY_H) */ diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index 6331af6f2..f11e254f6 100644 --- a/include/asm-alpha/smp.h +++ b/include/asm-alpha/smp.h @@ -24,7 +24,7 @@ __hard_smp_processor_id(void) #include <asm/irq.h> struct cpuinfo_alpha { - unsigned long loops_per_sec; + unsigned long loops_per_jiffy; unsigned long last_asn; int need_new_asn; int asn_lock; |