From patchwork Wed Jan 6 04:55:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 42283 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ECFBDB6F0A for ; Wed, 6 Jan 2010 17:12:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626Ab0AFGLc (ORCPT ); Wed, 6 Jan 2010 01:11:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753049Ab0AFGLb (ORCPT ); Wed, 6 Jan 2010 01:11:31 -0500 Received: from ozlabs.org ([203.10.76.45]:32963 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752615Ab0AFGKo (ORCPT ); Wed, 6 Jan 2010 01:10:44 -0500 Received: by ozlabs.org (Postfix, from userid 1010) id 3CD72B6EF7; Wed, 6 Jan 2010 17:10:40 +1100 (EST) Message-Id: <20100106045525.329010098@samba.org> References: <20100106045509.245662398@samba.org> User-Agent: quilt/0.46-1 Date: Wed, 06 Jan 2010 15:55:14 +1100 From: Anton Blanchard To: "David S. Miller" Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Rusty Russell , Andrew Morton Subject: [patch 5/6] sparc: cpumask_of_node() should handle -1 as a node Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org 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 Acked-by: David S. Miller Index: linux-cpumask/arch/sparc/include/asm/topology_64.h =================================================================== --- linux-cpumask.orig/arch/sparc/include/asm/topology_64.h 2010-01-06 15:20:22.912584116 +1100 +++ linux-cpumask/arch/sparc/include/asm/topology_64.h 2010-01-06 15:27:17.209419879 +1100 @@ -12,7 +12,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]) struct pci_bus; #ifdef CONFIG_PCI