lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86: cpu_khz type fix

Browse Source 
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>
This commit is contained in:
Andrew Morton
2005-06-23 00:08:34 -07:00
committed by Linus Torvalds
parent 129f69465b
commit a3a255e744
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/kernel/cpu/proc.c
View File

@@ -86,7 +86,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "stepping\t: unknown\n"); seq_printf(m, "stepping\t: unknown\n");
if ( cpu_has(c, X86_FEATURE_TSC) ) { 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)); cpu_khz / 1000, (cpu_khz % 1000));
} }

2
arch/i386/kernel/smpboot.c
View File

@@ -205,7 +205,7 @@ static void __init synchronize_tsc_bp (void)
unsigned long long t0; unsigned long long t0;
unsigned long long sum, avg; unsigned long long sum, avg;
long long delta; long long delta;
unsigned long one_usec; unsigned int one_usec;
int buggy = 0; int buggy = 0;
printk(KERN_INFO "checking TSC synchronization across %u CPUs: ", num_booting_cpus()); printk(KERN_INFO "checking TSC synchronization across %u CPUs: ", num_booting_cpus());

2
arch/i386/kernel/time.c
View File

@@ -77,7 +77,7 @@ u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64); 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); EXPORT_SYMBOL(cpu_khz);
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;

3
arch/i386/kernel/timers/common.c
View File

@@ -163,7 +163,8 @@ void init_cpu_khz(void)
:"=a" (cpu_khz), "=d" (edx) :"=a" (cpu_khz), "=d" (edx)
:"r" (tsc_quotient), :"r" (tsc_quotient),
"0" (eax), "1" (edx)); "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);
} }
} }
} }

2
arch/i386/kernel/timers/timer_hpet.c
View File

@@ -158,7 +158,7 @@ static int __init init_hpet(char* override)
{ unsigned long eax=0, edx=1000; { unsigned long eax=0, edx=1000;
ASM_DIV64_REG(cpu_khz, edx, tsc_quotient, ASM_DIV64_REG(cpu_khz, edx, tsc_quotient,
eax, edx); eax, edx);
printk("Detected %lu.%03lu MHz processor.\n", printk("Detected %u.%03u MHz processor.\n",
cpu_khz / 1000, cpu_khz % 1000); cpu_khz / 1000, cpu_khz % 1000);
} }
set_cyc2ns_scale(cpu_khz/1000); set_cyc2ns_scale(cpu_khz/1000);

7
arch/i386/kernel/timers/timer_tsc.c
View File

@@ -256,7 +256,7 @@ static unsigned long loops_per_jiffy_ref = 0;
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
static unsigned long fast_gettimeoffset_ref = 0; static unsigned long fast_gettimeoffset_ref = 0;
static unsigned long cpu_khz_ref = 0; static unsigned int cpu_khz_ref = 0;
#endif #endif
static int static int
@@ -323,7 +323,7 @@ static inline void cpufreq_delayed_get(void) { return; }
int recalibrate_cpu_khz(void) int recalibrate_cpu_khz(void)
{ {
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
unsigned long cpu_khz_old = cpu_khz; unsigned int cpu_khz_old = cpu_khz;
if (cpu_has_tsc) { if (cpu_has_tsc) {
init_cpu_khz(); init_cpu_khz();
@@ -534,7 +534,8 @@ static int __init init_tsc(char* override)
:"=a" (cpu_khz), "=d" (edx) :"=a" (cpu_khz), "=d" (edx)
:"r" (tsc_quotient), :"r" (tsc_quotient),
"0" (eax), "1" (edx)); "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); set_cyc2ns_scale(cpu_khz/1000);
return 0; return 0;

2
include/asm-i386/timex.h
View File

@@ -47,7 +47,7 @@ static inline cycles_t get_cycles (void)
return ret; return ret;
} }
extern unsigned long cpu_khz; extern unsigned int cpu_khz;
extern int read_current_timer(unsigned long *timer_value); extern int read_current_timer(unsigned long *timer_value);
#define ARCH_HAS_READ_CURRENT_TIMER 1 #define ARCH_HAS_READ_CURRENT_TIMER 1