x86_64/ia64 : Fix compilation error for node_to_first_cpu

PATCH New Ravikiran G Thirumalai 1 participant 1 message Dec 22, 2005

Share & tools

Ravikiran G Thirumalai

author

2005-12-22 22:21 UTC #0 lore raw

PATCH 1/1 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.

Please apply for 2.6.15

Signed-off-by Alok N Kataria <[email protected]>

Signed-off-by Ravikiran G Thirumalai <[email protected]>

Signed-off-by Shai Fultheim <[email protected]>

include/asm-ia64/topology.h +1 -1

Index: linux-2.6.15-rc6/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

include/asm-x86_64/topology.h +1 -1

Index: linux-2.6.15-rc6/include/asm-x86_64/topology.h
===================================================================
@@ -23,7 +23,7 @@
 
 #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));