diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-06-23 00:08:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:45:11 -0700 |
| commit | a3a255e744dfa672e741dc24306491139d0de2d8 (patch) | |
| tree | c19348966183d3ed79f6e9593a40d95c736e0665 /arch/i386/kernel/timers/timer_tsc.c | |
| parent | 129f69465b411592247c408f93d7106939223be1 (diff) | |
| download | kernel-crypto-a3a255e744dfa672e741dc24306491139d0de2d8.tar.gz kernel-crypto-a3a255e744dfa672e741dc24306491139d0de2d8.tar.xz kernel-crypto-a3a255e744dfa672e741dc24306491139d0de2d8.zip | |
[PATCH] x86: cpu_khz type fix
x86_64's cpu_khz is unsigned int and there is no reason why x86 needs to use
unsigned long.
So make cpu_khz unsigned int on x86 as well.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/timers/timer_tsc.c')
| -rw-r--r-- | arch/i386/kernel/timers/timer_tsc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c index 27f08ae9120..54c36b18202 100644 --- a/arch/i386/kernel/timers/timer_tsc.c +++ b/arch/i386/kernel/timers/timer_tsc.c @@ -256,7 +256,7 @@ static unsigned long loops_per_jiffy_ref = 0; #ifndef CONFIG_SMP static unsigned long fast_gettimeoffset_ref = 0; -static unsigned long cpu_khz_ref = 0; +static unsigned int cpu_khz_ref = 0; #endif static int @@ -323,7 +323,7 @@ static inline void cpufreq_delayed_get(void) { return; } int recalibrate_cpu_khz(void) { #ifndef CONFIG_SMP - unsigned long cpu_khz_old = cpu_khz; + unsigned int cpu_khz_old = cpu_khz; if (cpu_has_tsc) { init_cpu_khz(); @@ -534,7 +534,8 @@ static int __init init_tsc(char* override) :"=a" (cpu_khz), "=d" (edx) :"r" (tsc_quotient), "0" (eax), "1" (edx)); - printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); + printk("Detected %u.%03u MHz processor.\n", + cpu_khz / 1000, cpu_khz % 1000); } set_cyc2ns_scale(cpu_khz/1000); return 0; |