From: Ravikiran G Thirumalai Date: Thu, 22 Dec 2005 22:21:34 +0000 (-0800) Subject: [PATCH] x86_64/ia64 : Fix compilation error for node_to_first_cpu X-Git-Tag: v2.6.15-rc7~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c660439ba90aaaa056f68a5b0fc79f6b9e0506f5;p=linux-2.6-omap-h63xx.git [PATCH] x86_64/ia64 : Fix compilation error for node_to_first_cpu Fixes a compiler error in node_to_first_cpu, __ffs expects unsigned long as a parameter; instead cpumask_t was being passed. The macro node_to_first_cpu was not yet used in x86_64 and ia64 arches, and so we never hit this. This patch replaces __ffs with first_cpu macro, similar to other arches. Signed-off-by: Alok N Kataria Signed-off-by: Ravikiran G Thirumalai Signed-off-by: Shai Fultheim Signed-off-by: Linus Torvalds --- diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h index a9f738bf18a..f7c330467e7 100644 --- a/include/asm-ia64/topology.h +++ b/include/asm-ia64/topology.h @@ -38,7 +38,7 @@ /* * Returns the number of the first CPU on Node 'node'. */ -#define node_to_first_cpu(node) (__ffs(node_to_cpumask(node))) +#define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node))) /* * Determines the node for a given pci bus diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index d39ebd5263e..7d82bc56b9f 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h @@ -23,7 +23,7 @@ extern int __node_distance(int, int); #define cpu_to_node(cpu) (cpu_to_node[cpu]) #define parent_node(node) (node) -#define node_to_first_cpu(node) (__ffs(node_to_cpumask[node])) +#define node_to_first_cpu(node) (first_cpu(node_to_cpumask[node])) #define node_to_cpumask(node) (node_to_cpumask[node]) #define pcibus_to_node(bus) ((long)(bus->sysdata)) #define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus));