Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: 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>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Patchwork: http://patchwork.linux-mips.org/patch/831/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Anton Blanchard and committed by
Ralf Baechle
d797396f 0e8a1d82

+3 -1
+3 -1
arch/mips/include/asm/mach-ip27/topology.h
··· 24 24 25 25 #define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid) 26 26 #define parent_node(node) (node) 27 - #define cpumask_of_node(node) (&hub_data(node)->h_cpus) 27 + #define cpumask_of_node(node) ((node) == -1 ? \ 28 + cpu_all_mask : \ 29 + &hub_data(node)->h_cpus) 28 30 struct pci_bus; 29 31 extern int pcibus_to_node(struct pci_bus *); 30 32