Re: [GIT-PULL] time.c integration

Yinghai Lu
2008-07-30T22:00:51Z

On Wed, Jul 30, 2008 at 11:51 AM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Ingo Molnar <mingo@elte.hu> wrote:
>
>> Also, please do smaller steps while bringing both time_32.c and
>> time_64.c up into their final forms (and do it in multiple commits),
>> and make sure each step compiles on their respective defconfig. time.c
>> details are historically fragile, i'd not be surprised if this series
>> was the target of bisection efforts.
>
> i briefly put your current variant into tip/master, but it has build
> problems as well:
>
> arch/x86/kernel/io_apic_64.c: In function 'check_timer':
> arch/x86/kernel/io_apic_64.c:2016: error: 'timer_ack' undeclared (first use in this function)
> arch/x86/kernel/io_apic_64.c:2016: error: (Each undeclared identifier is reported only once
> arch/x86/kernel/io_apic_64.c:2016: error: for each function it appears in.)
>
> with:
>
> http://redhat.com/~mingo/misc/config-Wed_Jul_30_20_50_17_CEST_2008.bad
>
> Ingo
> --
diff --git a/include/asm-x86/timer.h b/include/asm-x86/timer.h
index d0babce..e4eb6ab 100644
--- a/include/asm-x86/timer.h
+++ b/include/asm-x86/timer.h
@@ -9,8 +9,8 @@
unsigned long long native_sched_clock(void);
unsigned long native_calibrate_tsc(void);

-#ifdef CONFIG_X86_32
extern int timer_ack;
+#ifdef CONFIG_X86_32
extern int recalibrate_cpu_khz(void);
#endif /* CONFIG_X86_32 */