Linus,
Here is the cleanup patch mentioned earlier that removes
fast_gettimeoffset_quotient from the global namespace. Where used it was
replaced by cpu_khz. The patch also yanks an unused variable.
please apply,
thanks
-john
diff -Nru a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/smpboot.c Wed Nov 6 13:22:56 2002
+++ b/arch/i386/kernel/smpboot.c Wed Nov 6 13:22:56 2002
@@ -181,8 +181,6 @@
#define NR_LOOPS 5
-extern unsigned long fast_gettimeoffset_quotient;
-
/*
* accurate 64-bit/32-bit division, expanded to 32-bit divisions and 64-bit
* multiplication. Not terribly optimized but we need it at boot time only
@@ -222,7 +220,8 @@
printk("checking TSC synchronization across %u CPUs: ", num_booting_cpus());
- one_usec = ((1<<30)/fast_gettimeoffset_quotient)*(1<<2);
+ /* convert from kcyc/sec to cyc/usec */
+ one_usec = cpu_khz / 1000;
atomic_set(&tsc_start_flag, 1);
wmb();
diff -Nru a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
--- a/arch/i386/kernel/timers/timer_tsc.c Wed Nov 6 13:22:56 2002
+++ b/arch/i386/kernel/timers/timer_tsc.c Wed Nov 6 13:22:56 2002
@@ -15,7 +15,6 @@
extern int x86_udelay_tsc;
extern spinlock_t i8253_lock;
-static int use_tsc;
/* Number of usecs that the last interrupt was delayed */
static int delay_at_last_interrupt;
@@ -26,7 +25,7 @@
* Equal to 2^32 * (1 / (clocks per usec) ).
* Initialized in time_init.
*/
-unsigned long fast_gettimeoffset_quotient;
+static unsigned long fast_gettimeoffset_quotient;
static unsigned long get_offset_tsc(void)
{
@@ -260,7 +259,6 @@
unsigned long tsc_quotient = calibrate_tsc();
if (tsc_quotient) {
fast_gettimeoffset_quotient = tsc_quotient;
- use_tsc = 1;
/*
* We could be more selective here I suspect
* and just enable this for the next intel chips ?