Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c660439b authored Dec 22, 2005 by Ravikiran G Thirumalai Committed by Linus Torvalds Dec 24, 2005

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

parent 1224b375

include/asm-ia64/topology.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@
	/*		/*
	* Returns the number of the first CPU on Node 'node'.		* 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		* Determines the node for a given pci bus

include/asm-x86_64/topology.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ extern int __node_distance(int, int);

	#define cpu_to_node(cpu) (cpu_to_node[cpu])		#define cpu_to_node(cpu) (cpu_to_node[cpu])
	#define parent_node(node) (node)		#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 node_to_cpumask(node) (node_to_cpumask[node])
	#define pcibus_to_node(bus) ((long)(bus->sysdata))		#define pcibus_to_node(bus) ((long)(bus->sysdata))
	#define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus));		#define pcibus_to_cpumask(bus) node_to_cpumask(pcibus_to_node(bus));