[patch] x86_64/ia64 : Fix compilation error for node_to_first_cpu

[Ravikiran G Thirumalai <kiran@scalex86.org>]

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 <alokk@calsoftinc.com>
Signed-off-by: Ravikiran G Thirumalai <kiran@scalex86.org>
Signed-off-by: Shai Fultheim <shai@scalex86.org>


Index: linux-2.6.15-rc6/include/asm-ia64/topology.h
===================================================================
--- linux-2.6.15-rc6.orig/include/asm-ia64/topology.h	2005-10-27 17:02:08.000000000 -0700
+++ linux-2.6.15-rc6/include/asm-ia64/topology.h	2005-12-22 10:48:14.000000000 -0800
@@ -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
Index: linux-2.6.15-rc6/include/asm-x86_64/topology.h
===================================================================
--- linux-2.6.15-rc6.orig/include/asm-x86_64/topology.h	2005-12-22 10:06:01.000000000 -0800
+++ linux-2.6.15-rc6/include/asm-x86_64/topology.h	2005-12-22 10:41:30.000000000 -0800
@@ -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));
-
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/