2009-03-30 16:02:19

by Peter Teoh

[permalink] [raw]
Subject: compilation error in linus git tree

just git pulled and compiled with the following errors:

CC [M] arch/x86/kernel/cpu/cpufreq/speedstep-lib.o
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

not sure where is the best place to put this, but the error is resolved via

extern int recalibrate_cpu_khz(void);

inside the file:

arch/x86/kernel/cpu/cpufreq/p4-clockmod.c

thanks.

--
Regards,
Peter Teoh


2009-03-30 16:16:24

by Frederic Weisbecker

[permalink] [raw]
Subject: Re: compilation error in linus git tree

Hi,


On Mon, Mar 30, 2009 at 12:01:59PM -0400, Peter Teoh wrote:
> just git pulled and compiled with the following errors:
>
> CC [M] arch/x86/kernel/cpu/cpufreq/speedstep-lib.o
> 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
>
> not sure where is the best place to put this, but the error is resolved via
>
> extern int recalibrate_cpu_khz(void);
>
> inside the file:
>
> arch/x86/kernel/cpu/cpufreq/p4-clockmod.c


Indeed but its prototype is already defined in asm/timer.h
This is a missing include, can you tell me if the patch below fixes
your problem?

Thanks,
Frederic.


--

>From c4a2eec69fa98b6cdb060c593a720099878bf854 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <[email protected]>
Date: Mon, 30 Mar 2009 18:08:37 +0200
Subject: [PATCH] x86: fix missing include asm/timer.h in p4-clockmod.c

Impact: fix build error

arch/x86/kernel/cpu/cpufreq/p4-clockmod.c lacks the prototype
of recalibrate_cpu_khz(), we need to include asm/timer.h

Reported-by: Peter Teoh <[email protected]>
Signed-off-by: Frederic Weisbecker <[email protected]>
---
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index d8341d1..aca3f11 100644
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@ -31,6 +31,7 @@
#include <asm/processor.h>
#include <asm/msr.h>
#include <asm/timex.h>
+#include <asm/timer.h>

#include "speedstep-lib.h"

--
1.6.1

2009-03-31 06:33:21

by Peter Teoh

[permalink] [raw]
Subject: Re: compilation error in linus git tree

Yes it worked, although the line number is slightly different for
linus git tree.

The modified version is as follows. Thanks!!!!

On Tue, Mar 31, 2009 at 12:16 AM, Frederic Weisbecker
<[email protected]> wrote:
> Hi,
>
>
> On Mon, Mar 30, 2009 at 12:01:59PM -0400, Peter Teoh wrote:
>> just git pulled and compiled with the following errors:
>>
>> ? CC [M] ?arch/x86/kernel/cpu/cpufreq/speedstep-lib.o
>> ? 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
>>
>> not sure where is the best place to put this, but the error is resolved via
>>
>> extern int recalibrate_cpu_khz(void);
>>
>> inside the file:
>>
>> arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
>
>
> Indeed but its prototype is already defined in asm/timer.h
> This is a missing include, can you tell me if the patch below fixes
> your problem?
>
> Thanks,
> Frederic.
>
>
> --
>
> From c4a2eec69fa98b6cdb060c593a720099878bf854 Mon Sep 17 00:00:00 2001
> From: Frederic Weisbecker <[email protected]>
> Date: Mon, 30 Mar 2009 18:08:37 +0200
> Subject: [PATCH] x86: fix missing include asm/timer.h in p4-clockmod.c
>
> Impact: fix build error
>
> arch/x86/kernel/cpu/cpufreq/p4-clockmod.c lacks the prototype
> of recalibrate_cpu_khz(), we need to include asm/timer.h
>
> Reported-by: Peter Teoh <[email protected]>
> Signed-off-by: Frederic Weisbecker <[email protected]>
> ---
> ?arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | ? ?1 +
> ?1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
> index d8341d1..aca3f11 100644
> --- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
> +++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
> @@ -31,6 +31,7 @@
> ?#include <asm/processor.h>
> ?#include <asm/msr.h>
> ?#include <asm/timex.h>
> +#include <asm/timer.h>
>
> ?#include "speedstep-lib.h"
>
> --
> 1.6.1
>
>
>

Reported-by: Peter Teoh <[email protected]>
Signed-off-by: Frederic Weisbecker <[email protected]>

diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpu
index 41ed949..fd8ec01 100644
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@ -28,6 +28,7 @@
#include <linux/slab.h>
#include <linux/cpumask.h>
#include <linux/timex.h>
+#include <linux/timer.h>

#include <asm/processor.h>
#include <asm/msr.h>




--
Regards,
Peter Teoh