From 930038d0126e58462534e7b855c6f969780f5022 Mon Sep 17 00:00:00 2001 From: Ravikiran G Thirumalai Date: Thu, 22 Dec 2005 14:21:34 -0800 Subject: [PATCH] --- yaml --- r: 15323 b: refs/heads/master c: c660439ba90aaaa056f68a5b0fc79f6b9e0506f5 h: refs/heads/master i: 15321: b52b945200dc52e063ed38d144197d5d0dd952ad 15319: 79a471b5a4a3107364407b2f1f78f8376f2abe34 v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/topology.h | 2 +- trunk/include/asm-x86_64/topology.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7332360e5fca..70ae57af72f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1224b375ed7982128602a3fa1da53eeeac1750b4 +refs/heads/master: c660439ba90aaaa056f68a5b0fc79f6b9e0506f5 diff --git a/trunk/include/asm-ia64/topology.h b/trunk/include/asm-ia64/topology.h index a9f738bf18a7..f7c330467e7e 100644 --- a/trunk/include/asm-ia64/topology.h +++ b/trunk/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/trunk/include/asm-x86_64/topology.h b/trunk/include/asm-x86_64/topology.h index d39ebd5263ed..7d82bc56b9fa 100644 --- a/trunk/include/asm-x86_64/topology.h +++ b/trunk/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));