summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/timex.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-06-23 00:08:34 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 09:45:11 -0700
commita3a255e744dfa672e741dc24306491139d0de2d8 (patch)
treec19348966183d3ed79f6e9593a40d95c736e0665 /include/asm-i386/timex.h
parent129f69465b411592247c408f93d7106939223be1 (diff)
[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 'include/asm-i386/timex.h')
-rw-r--r--include/asm-i386/timex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h
index e370f907bd3..292b5a68f62 100644
--- a/include/asm-i386/timex.h
+++ b/include/asm-i386/timex.h
@@ -47,7 +47,7 @@ static inline cycles_t get_cycles (void)
return ret;
}
-extern unsigned long cpu_khz;
+extern unsigned int cpu_khz;
extern int read_current_timer(unsigned long *timer_value);
#define ARCH_HAS_READ_CURRENT_TIMER 1