> -----Original Message-----
> From: Andrew Morton [mailto:akpm@osdl.org] 
> 
> john stultz <johnstul@us.ibm.com> wrote:
> >
> > Anyway, the HPET changes made calibrate_tsc() static, which 
> it probably
> > should be, but it broke the timer_cyclone code. This patch 
> fixes it back
> > up by re-implementing calibrate_tsc() locally as it was done in
> > timer_hpet.c 
> 
> <stdrant>
> Of course if some bozo had stuck this:
> 
> 	extern unsigned long calibrate_tsc(void);
> 
> in a header file rather than in a .c file (timer_cyclone.c), 
> this problem
> would not have occurred.  Nevereverever put extern 
> declarations in .c files!
> </stdrant>


My fault. I should have atleast test compiled cyclone timer code.


> Can we not we avoid the cut-n-paste coding?
> 
> There is also timer_tsc.c:calibrate_tsc_hpet() which is 
> almost the same as
> timer_hpet.c:calibrate_tsc().  Seem to me that we could tweak
> calibrate_tsc_hpet() a bit, unstaticalise 
> timer_tsc.c:calibrate_tsc() and
> have two functions rather than four?
> 


How about the attached patch (against mm4), that moves all 
calibrate tsc functions into a common file, avoiding the duplication. 
This time I could successfully compile cyclone timer too :). However,
I had to do an unrelated one line change in fixmap (last chunk in 
the patch) to compile for summit.


Thanks,
-Venkatesh