Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755180Ab0AFGMB (ORCPT ); Wed, 6 Jan 2010 01:12:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752651Ab0AFGL5 (ORCPT ); Wed, 6 Jan 2010 01:11:57 -0500 Received: from ozlabs.org ([203.10.76.45]:32975 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549Ab0AFGKn (ORCPT ); Wed, 6 Jan 2010 01:10:43 -0500 Message-Id: <20100106045524.853685851@samba.org> References: <20100106045509.245662398@samba.org> User-Agent: quilt/0.46-1 Date: Wed, 06 Jan 2010 15:55:10 +1100 From: Anton Blanchard To: Benjamin Herrenschmidt Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org, Rusty Russell , Andrew Morton Subject: [patch 1/6] powerpc: cpumask_of_node() should handle -1 as a node Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1518 Lines: 43 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 --- Index: linux-cpumask/arch/powerpc/include/asm/topology.h =================================================================== --- linux-cpumask.orig/arch/powerpc/include/asm/topology.h 2010-01-06 15:20:22.992583563 +1100 +++ linux-cpumask/arch/powerpc/include/asm/topology.h 2010-01-06 15:27:24.058833128 +1100 @@ -17,7 +17,9 @@ static inline int cpu_to_node(int cpu) #define parent_node(node) (node) -#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) +#define cpumask_of_node(node) ((node) == -1 ? \ + cpu_all_mask : \ + &numa_cpumask_lookup_table[node]) int of_node_to_nid(struct device_node *device); -- -- 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/