Re: 2.6.14-mm1

[Brice Goglin <Brice.Goglin@ens-lyon.org>]

Andrew Morton wrote:

>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14/2.6.14-mm1/
>  
>
Hi Andrew,

drivers/cpufreq/cpufreq.c uses current_in_cpu_hotplug.
But, kernel/cpu.c is not built on UP boxes.
This generates the following error:

  LD      .tmp_vmlinux1
drivers/built-in.o: In function `__cpufreq_driver_target':
: undefined reference to `current_in_cpu_hotplug'

The attached patch should fix it.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>

Regards,
Brice

--- linux-mm/include/linux/cpu.h.old	2005-11-06 22:08:39.000000000 -0500
+++ linux-mm/include/linux/cpu.h	2005-11-06 22:41:17.000000000 -0500
@@ -33,7 +33,6 @@
 
 extern int register_cpu(struct cpu *, int, struct node *);
 extern struct sys_device *get_cpu_sysdev(int cpu);
-extern int current_in_cpu_hotplug(void);
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *, struct node *);
 #endif
@@ -43,6 +42,7 @@
 /* Need to know about CPUs going up/down? */
 extern int register_cpu_notifier(struct notifier_block *nb);
 extern void unregister_cpu_notifier(struct notifier_block *nb);
+extern int current_in_cpu_hotplug(void);
 
 int cpu_up(unsigned int cpu);
 
@@ -55,6 +55,10 @@
 static inline void unregister_cpu_notifier(struct notifier_block *nb)
 {
 }
+static inline int current_in_cpu_hotplug(void)
+{
+	return 0;
+}
 
 #endif /* CONFIG_SMP */
 extern struct sysdev_class cpu_sysdev_class;