summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/time.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-06-23 09:08:34 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 18:45:11 +0200
commita3a255e744dfa672e741dc24306491139d0de2d8 (patch)
treec19348966183d3ed79f6e9593a40d95c736e0665 /arch/i386/kernel/time.c
parent[PATCH] Remove i386_ksyms.c, almost. (diff)
downloadlinux-a3a255e744dfa672e741dc24306491139d0de2d8.tar.xz
linux-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/time.c')
-rw-r--r--arch/i386/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 8bc8363fbb4c..e68d9fdb0759 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -77,7 +77,7 @@ u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
-unsigned long cpu_khz; /* Detected as we calibrate the TSC */
+unsigned int cpu_khz; /* Detected as we calibrate the TSC */
EXPORT_SYMBOL(cpu_khz);
extern unsigned long wall_jiffies;