[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20090330165516.GA11902@redhat.com>
Date: Mon, 30 Mar 2009 12:55:16 -0400
From: Dave Jones <davej@...hat.com>
To: Frederik Deweerdt <frederik.deweerdt@...og.eu>
Cc: linux-kernel@...r.kernel.org
Subject: Re: [patch] P4 clock mod: recalibrate_cpu_khz on ia32 only
On Mon, Mar 30, 2009 at 04:41:53PM +0000, Frederik Deweerdt wrote:
> Hello Dave,
>
> I just triggered the following compile error with an old .config on
> x86_64, (latest git):
>
> CHK include/linux/version.h
> CHK include/linux/utsrelease.h
> SYMLINK include/asm -> include/asm-x86
> CALL scripts/checksyscalls.sh
> CHK include/linux/compile.h
> CC [M] arch/x86/kernel/cpu/cpufreq/p4-clockmod.o
> arch/x86/kernel/cpu/cpufreq/p4-clockmod.c: In function ‘cpufreq_p4_cpu_init’:
> arch/x86/kernel/cpu/cpufreq/p4-clockmod.c:232: error: implicit declaration of function ‘recalibrate_cpu_khz’
> make[3]: *** [arch/x86/kernel/cpu/cpufreq/p4-clockmod.o] Error 1
> make[2]: *** [arch/x86/kernel/cpu/cpufreq] Error 2
> make[1]: *** [arch/x86/kernel/cpu] Error 2
> make: *** [arch/x86/kernel] Error 2
>
> The attached patch calls recalibrate_cpu_khz on ia32 only
Wrong fix. It needs to be called on 64 bit too.
The real fix is to reinstate this diff which the recent x86 merge reverted..
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 2bb6a83..4f5c247 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -11,8 +11,8 @@ unsigned long native_calibrate_tsc(void);
#ifdef CONFIG_X86_32
extern int timer_ack;
+#endif
extern int recalibrate_cpu_khz(void);
-#endif /* CONFIG_X86_32 */
extern int no_timer_check;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists