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

7 files changed, 11 insertions, 9 deletions

diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 7323c19f354e..8bd77d948a84 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -86,7 +86,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "stepping\t: unknown\n");
 
         if ( cpu_has(c, X86_FEATURE_TSC) ) {
-                seq_printf(m, "cpu MHz\t\t: %lu.%03lu\n",
+                seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
                         cpu_khz / 1000, (cpu_khz % 1000));
         }
 
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index aaad95e7f879..c20d96d5c15c 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -205,7 +205,7 @@ static void __init synchronize_tsc_bp (void)
         unsigned long long t0;
         unsigned long long sum, avg;
         long long delta;
-        unsigned long one_usec;
+        unsigned int one_usec;
         int buggy = 0;
 
         printk(KERN_INFO "checking TSC synchronization across %u CPUs: ", num_booting_cpus());
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;
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;
diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h
index e370f907bd39..292b5a68f627 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