summaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/mach-ip27/topology.h
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-10-03 15:27:24 +0300
committerPaul Burton <paul.burton@mips.com>2019-10-07 19:37:59 +0300
commit4bf841ebf17aaa0f7712623896c699b44fa92f44 (patch)
treef797ee734d0eb2409905f5024f9a5d0ef75404d0 /arch/mips/include/asm/mach-ip27/topology.h
parent46a73e9e6ccc77619838885439873af41a5ad1c1 (diff)
downloadlinux-4bf841ebf17aaa0f7712623896c699b44fa92f44.tar.xz
MIPS: SGI-IP27: get rid of compact node ids
Node ids don't need to be contiguous in Linux, so the concept to use compact node ids to make them contiguous isn't needed at all. This patchset therefore removes it. Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/mips/include/asm/mach-ip27/topology.h')
-rw-r--r--arch/mips/include/asm/mach-ip27/topology.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h
index 965f0793a5f9..a717af9177ff 100644
--- a/arch/mips/include/asm/mach-ip27/topology.h
+++ b/arch/mips/include/asm/mach-ip27/topology.h
@@ -7,14 +7,13 @@
#include <asm/mmzone.h>
struct cpuinfo_ip27 {
- cnodeid_t p_nodeid; /* my node ID in compact-id-space */
nasid_t p_nasid; /* my node ID in numa-as-id-space */
unsigned char p_slice; /* Physical position on node board */
};
extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
-#define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid)
+#define cpu_to_node(cpu) (cputonasid(cpu))
#define cpumask_of_node(node) ((node) == -1 ? \
cpu_all_mask : \
&hub_data(node)->h_cpus)