MIPS: SGI-IP27: replace MAX_COMPACT_NODE with MAX_NUMNODES (c80b4896) · Commits · 戴 / test

arch/mips/include/asm/mach-ip27/topology.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ extern int pcibus_to_node(struct pci_bus *);

		#define cpumask_of_pcibus(bus) (cpumask_of_node(pcibus_to_node(bus)))

		extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
		extern unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];

		#define node_distance(from, to) (__node_distances[(from)][(to)])

+1 −3

Original line number	Diff line number	Diff line
		@@ -60,9 +60,7 @@ typedef struct gda {
		/* Pointer to a mask of nodes with copies
		* of the kernel. */
		char g_padding[56]; /* pad out to 128 bytes */
		nasid_t g_nasidtable[MAX_COMPACT_NODES]; /* NASID of each node,
		* indexed by cnodeid.
		*/
		nasid_t g_nasidtable[MAX_NUMNODES]; /* NASID of each node */
		} gda_t;

		#define GDA ((gda_t*) GDA_ADDR(get_nasid()))

+1 −15

Original line number	Diff line number	Diff line
		@@ -12,25 +12,11 @@
		#define _ASM_SN_SN0_ARCH_H


		#ifndef SN0XXL /* 128 cpu SMP max */
		/*
		* This is the maximum number of nodes that can be part of a kernel.
		* Effectively, it's the maximum number of compact node ids (cnodeid_t).
		*/
		#define MAX_COMPACT_NODES 64

		/*
		* MAXCPUS refers to the maximum number of CPUs in a single kernel.
		* This is not necessarily the same as MAXNODES * CPUS_PER_NODE
		*/
		#define MAXCPUS 128

		#else /* SN0XXL system */

		#define MAX_COMPACT_NODES 128
		#define MAXCPUS 256

		#endif /* SN0XXL */
		#define MAXCPUS (MAX_NUMNODES * CPUS_PER_NODE)

		/*
		* This is the maximum number of NASIDS that can be present in a system.

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@

		#define CPU_NONE (cpuid_t)-1

		static DECLARE_BITMAP(hub_init_mask, MAX_COMPACT_NODES);
		static DECLARE_BITMAP(hub_init_mask, MAX_NUMNODES);
		nasid_t master_nasid = INVALID_NASID;

		struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];

+5 −5

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
		#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)

		struct node_data *__node_data[MAX_COMPACT_NODES];
		struct node_data *__node_data[MAX_NUMNODES];

		EXPORT_SYMBOL(__node_data);

		@@ -104,7 +104,7 @@ static void router_recurse(klrou_t router_a, klrou_t router_b, int depth)
		router_a->rou_rflag = 0;
		}

		unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
		unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];
		EXPORT_SYMBOL(__node_distances);

		static int __init compute_node_distance(nasid_t nasid_a, nasid_t nasid_b)
		@@ -173,8 +173,8 @@ static void __init init_topology_matrix(void)
		{
		nasid_t row, col;

		for (row = 0; row < MAX_COMPACT_NODES; row++)
		for (col = 0; col < MAX_COMPACT_NODES; col++)
		for (row = 0; row < MAX_NUMNODES; row++)
		for (col = 0; col < MAX_NUMNODES; col++)
		__node_distances[row][col] = -1;

		for_each_online_node(row) {
		@@ -412,7 +412,7 @@ void __init prom_meminit(void)
		szmem();
		max_low_pfn = PHYS_PFN(memblock_end_of_DRAM());

		for (node = 0; node < MAX_COMPACT_NODES; node++) {
		for (node = 0; node < MAX_NUMNODES; node++) {
		if (node_online(node)) {
		node_mem_init(node);
		continue;