[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>

3 files changed, 7 insertions, 5 deletions

diff --git a/arch/i386/kernel/timers/common.c b/arch/i386/kernel/timers/common.c
index b38cc0d0c71a..37353bd31803 100644
--- a/arch/i386/kernel/timers/common.c
+++ b/arch/i386/kernel/timers/common.c
@@ -163,7 +163,8 @@ void init_cpu_khz(void)
                                 :"=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);
                         }
                 }
         }
diff --git a/arch/i386/kernel/timers/timer_hpet.c b/arch/i386/kernel/timers/timer_hpet.c
index 15a7d727bd6f..d766e0963ac1 100644
--- a/arch/i386/kernel/timers/timer_hpet.c
+++ b/arch/i386/kernel/timers/timer_hpet.c
@@ -158,7 +158,7 @@ static int __init init_hpet(char* override)
                         {       unsigned long eax=0, edx=1000;
                                 ASM_DIV64_REG(cpu_khz, edx, tsc_quotient,
                                                 eax, edx);
-                                printk("Detected %lu.%03lu MHz processor.\n",
+                                printk("Detected %u.%03u MHz processor.\n",
                                         cpu_khz / 1000, cpu_khz % 1000);
                         }
                         set_cyc2ns_scale(cpu_khz/1000);
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
index 27f08ae9120b..54c36b182021 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;