Re: 2.6.14-mm1 - cpufreq build problem

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Monday, 7 of November 2005 03:24, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14/2.6.14-mm1/

Apparently cpufreq cannot be built without CONFIG_SMP now.  I use the appended
patch as a workaround.

Greetings,
Rafael


Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Index: linux-2.6.14-mm1/include/linux/cpu.h
===================================================================
--- linux-2.6.14-mm1.orig/include/linux/cpu.h	2005-11-07 22:35:11.000000000 +0100
+++ linux-2.6.14-mm1/include/linux/cpu.h	2005-11-07 22:37:12.000000000 +0100
@@ -33,7 +33,9 @@
 
 extern int register_cpu(struct cpu *, int, struct node *);
 extern struct sys_device *get_cpu_sysdev(int cpu);
+#ifdef CONFIG_SMP
 extern int current_in_cpu_hotplug(void);
+#endif
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *, struct node *);
 #endif
Index: linux-2.6.14-mm1/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-2.6.14-mm1.orig/drivers/cpufreq/cpufreq.c	2005-11-07 22:38:00.000000000 +0100
+++ linux-2.6.14-mm1/drivers/cpufreq/cpufreq.c	2005-11-07 22:38:21.000000000 +0100
@@ -29,6 +29,10 @@
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "cpufreq-core", msg)
 
+#ifndef CONFIG_SMP
+static int current_in_cpu_hotplug(void) { return 0; }
+#endif
+
 /**
  * The "cpufreq driver" - the arch- or hardware-dependend low
  * level driver of CPUFreq support, and its spinlock. This lock
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/