From 4b7e3a26bdd13bf637ba454be472587b626e587c Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 6 Jan 2010 15:55:13 +1100 Subject: [PATCH] --- yaml --- r: 179161 b: refs/heads/master c: d797396f3387c5be8f63fcc8e9be98bb884ea86a h: refs/heads/master i: 179159: d67ac5ee89c917cf6a26926b6de0915e74a8dd92 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/mach-ip27/topology.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cdf29df8a97..0bfbb7a46717 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e8a1d8262f41d6e8c1d736a408882bbb7a5c0a6 +refs/heads/master: d797396f3387c5be8f63fcc8e9be98bb884ea86a diff --git a/trunk/arch/mips/include/asm/mach-ip27/topology.h b/trunk/arch/mips/include/asm/mach-ip27/topology.h index 09a59bcc1b07..1b1a7d1632b9 100644 --- a/trunk/arch/mips/include/asm/mach-ip27/topology.h +++ b/trunk/arch/mips/include/asm/mach-ip27/topology.h @@ -24,7 +24,9 @@ extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS]; #define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid) #define parent_node(node) (node) -#define cpumask_of_node(node) (&hub_data(node)->h_cpus) +#define cpumask_of_node(node) ((node) == -1 ? \ + cpu_all_mask : \ + &hub_data(node)->h_cpus) struct pci_bus; extern int pcibus_to_node(struct pci_bus *);