* CPUFreq compilation failure with current GIT.
@ 2007-07-13 3:23 Nigel Cunningham
2007-07-13 4:53 ` Dave Jones
0 siblings, 1 reply; 3+ messages in thread
From: Nigel Cunningham @ 2007-07-13 3:23 UTC (permalink / raw)
To: LKML, Dave Jones, Mark Langsdorf
[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]
Hi.
Current git compilation fails on my amd64:
CC [M] arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/acpi-cpufreq.o
CC [M] arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.o
arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_init':
arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.c:1334: error: 'struct cpuinfo_x86' has no member named 'booted_cores'
make[2]: *** [arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.o] Error 1
make[1]: *** [arch/x86_64/kernel/cpufreq] Error 2
make: *** [arch/x86_64/kernel] Error 2
The following commit apparently wasn't tested on x86_64 as well:
Commit: 904f7a3f042b5c6aa9e53ce83f2c9de5e33170ff
Author: Dave Jones <davej@redhat.com> Fri, 18 May 2007 13:22:28 -0400
[CPUFREQ] powernow-k8: clarify number of cores.
Indicate number of processors and cores more cleanly
in startup messages.
Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Regards,
Nigel
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: CPUFreq compilation failure with current GIT.
2007-07-13 3:23 CPUFreq compilation failure with current GIT Nigel Cunningham
@ 2007-07-13 4:53 ` Dave Jones
2007-07-13 6:29 ` Nigel Cunningham
0 siblings, 1 reply; 3+ messages in thread
From: Dave Jones @ 2007-07-13 4:53 UTC (permalink / raw)
To: Nigel Cunningham; +Cc: LKML, Mark Langsdorf
On Fri, Jul 13, 2007 at 01:23:16PM +1000, Nigel Cunningham wrote:
> Hi.
>
> Current git compilation fails on my amd64:
>
> CC [M] arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/acpi-cpufreq.o
> CC [M] arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.o
> arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.c: In function 'powernowk8_init':
> arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.c:1334: error: 'struct cpuinfo_x86' has no member named 'booted_cores'
> make[2]: *** [arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/powernow-k8.o] Error 1
> make[1]: *** [arch/x86_64/kernel/cpufreq] Error 2
> make: *** [arch/x86_64/kernel] Error 2
Fixed in cpufreq.git, will go to linus real soon.
patch below..
Dave
From: Andrew Morton <akpm@linux-foundation.org>
Make it compile on UP.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Jones <davej@redhat.com>
---
arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff -puN arch/i386/kernel/cpu/cpufreq/powernow-k8.c~git-cpufreq-fix arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c~git-cpufreq-fix
+++ a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
@@ -1322,16 +1322,21 @@ static struct cpufreq_driver cpufreq_amd
static int __cpuinit powernowk8_init(void)
{
unsigned int i, supported_cpus = 0;
+ unsigned int booted_cores = 1;
for_each_online_cpu(i) {
if (check_supported_cpu(i))
supported_cpus++;
}
+#ifdef CONFIG_SMP
+ booted_cores = cpu_data[0].booted_cores;
+#endif
+
if (supported_cpus == num_online_cpus()) {
printk(KERN_INFO PFX "Found %d %s "
"processors (%d cpu cores) (" VERSION ")\n",
- supported_cpus/cpu_data[0].booted_cores,
+ supported_cpus/booted_cores,
boot_cpu_data.x86_model_id, supported_cpus);
return cpufreq_register_driver(&cpufreq_amd64_driver);
}
_
--
http://www.codemonkey.org.uk
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: CPUFreq compilation failure with current GIT.
2007-07-13 4:53 ` Dave Jones
@ 2007-07-13 6:29 ` Nigel Cunningham
0 siblings, 0 replies; 3+ messages in thread
From: Nigel Cunningham @ 2007-07-13 6:29 UTC (permalink / raw)
To: Dave Jones; +Cc: LKML, Mark Langsdorf
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
Hi Dave et al.
On Friday 13 July 2007 14:53:46 Dave Jones wrote:
> On Fri, Jul 13, 2007 at 01:23:16PM +1000, Nigel Cunningham wrote:
> Fixed in cpufreq.git, will go to linus real soon.
> patch below..
Thanks!
Nigel
--
See http://www.tuxonice.net for Howtos, FAQs, mailing
lists, wiki and bugzilla info.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-13 6:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-13 3:23 CPUFreq compilation failure with current GIT Nigel Cunningham
2007-07-13 4:53 ` Dave Jones
2007-07-13 6:29 ` Nigel Cunningham
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox