[PATCH] fix cpumask.h in mainline for UPu

[PATCH] fix cpumask.h in mainline for UPu

[Bruno Ducrot]

I'm trying to replace for_each_cpu() with for_each_cpu_mask() in
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c

Unfortunately, though, davej pointed me that for_each_cpu_mask()
is not defined in -bk if CONFIG_SMP is not defined.  Since this macro is
the only one not defined if compiled for UP, and since -mm tree do have
the correct behaviour already, is it possible to get this patch in mainline
before this portion of -mm is merged?


 include/linux/cpumask.h |    1 +
 1 files changed, 1 insertion(+)

--- a/include/linux/cpumask.h	2004/06/11 16:06:48
+++ b/include/linux/cpumask.h	2004/06/11 16:08:06
@@ -41,6 +41,7 @@ extern cpumask_t cpu_present_map;
 #define cpu_possible(cpu)		({ BUG_ON((cpu) != 0); 1; })
 #define cpu_present(cpu)		({ BUG_ON((cpu) != 0); 1; })
 
+#define for_each_cpu_mask(cpu, mask) for (cpu = 0; cpu < 1; cpu++)
 #define for_each_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)
 #define for_each_online_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)
 #define for_each_present_cpu(cpu) for (cpu = 0; cpu < 1; cpu++)



Cheers,

-- 
Bruno Ducrot

--  Which is worse:  ignorance or apathy?
--  Don't know.  Don't care.

Re: [PATCH] fix cpumask.h in mainline for UPu

[Andrew Morton]

Bruno Ducrot <poup@poupinou.org> wrote:
>
> I'm trying to replace for_each_cpu() with for_each_cpu_mask() in
> arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
> 
> Unfortunately, though, davej pointed me that for_each_cpu_mask()
> is not defined in -bk if CONFIG_SMP is not defined.  Since this macro is
> the only one not defined if compiled for UP, and since -mm tree do have
> the correct behaviour already, is it possible to get this patch in mainline
> before this portion of -mm is merged?
> 
> +#define for_each_cpu_mask(cpu, mask) for (cpu = 0; cpu < 1; cpu++)

Yup, I'll merge that up prior to 2.6.7, thanks.