Skip to contentSkip to conversation

CPUFreq compilation failure with current GIT.

DISCUSSION Nigel Cunningham 2 participants 3 messages Jul 13, 2007

lore
Share & tools
lore
#0 lore raw

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 <[email protected]> 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.

Regards,

Nigel

#1 lore raw
Quoted 11 lines · Nigel Cunningham

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 <[email protected]>

Make it compile on UP.

---

 arch/i386/kernel/cpu/cpufreq/powernow-k8.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/i386/kernel/cpu/cpufreq/powernow-k8.c renamed from arch/i386/kernel/cpu/cpufreq/powernow-k8.c~git-cpufreq-fix +6 -1
diff -puN arch/i386/kernel/cpu/cpufreq/powernow-k8.c~git-cpufreq-fix 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);
 	}

_

Signature · 1 line
http://www.codemonkey.org.uk
#2 lore raw

Hi Dave et al.

Quoted 3 lines · 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

Signature · 2 lines
See http://www.tuxonice.net for Howtos, FAQs, mailing
lists, wiki and bugzilla info.