aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/include/asm/topology.h
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2010-01-06 15:55:12 +1100
committerTony Luck <tony.luck@intel.com>2010-01-06 15:47:57 -0800
commit1d1e9f04216b379000128392b11edd7f5d0ebed1 (patch)
tree450002f3d4defb270aa150df1dccf123cd3b0844 /arch/ia64/include/asm/topology.h
parentc6f7afaeeda5b3c42ea8d7b27e197d223a04675e (diff)
[IA64] cpumask_of_node() should handle -1 as a node
pcibus_to_node can return -1 if we cannot determine which node a pci bus is on. If passed -1, cpumask_of_node will negatively index the lookup array and pull in random data: # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus 00000000,00000003,00000000,00000000 # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist 64-65 Change cpumask_of_node to check for -1 and return cpu_all_mask in this case: # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus ffffffff,ffffffff,ffffffff,ffffffff # cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist 0-127 Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/topology.h')
-rw-r--r--arch/ia64/include/asm/topology.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h
index 3ddb4e709db..d323071d0f9 100644
--- a/arch/ia64/include/asm/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@ -33,7 +33,9 @@
/*
* Returns a bitmask of CPUs on Node 'node'.
*/
-#define cpumask_of_node(node) (&node_to_cpu_mask[node])
+#define cpumask_of_node(node) ((node) == -1 ? \
+ cpu_all_mask : \
+ &node_to_cpu_mask[node])
/*
* Returns the number of the node containing Node 'nid'.