powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID (8c272261) · Commits · 戴 / test

arch/powerpc/Kconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -453,6 +453,10 @@ config NODES_SHIFT
		default "4"
		depends on NEED_MULTIPLE_NODES

		config USE_PERCPU_NUMA_NODE_ID
		def_bool y
		depends on NUMA

		config ARCH_SELECT_MEMORY_MODEL
		def_bool y
		depends on PPC64

+0 −13

Original line number	Diff line number	Diff line
		@@ -20,19 +20,6 @@ struct device_node;

		#include <asm/mmzone.h>

		static inline int cpu_to_node(int cpu)
		{
		int nid;

		nid = numa_cpu_lookup_table[cpu];

		/*
		* During early boot, the numa-cpu lookup table might not have been
		* setup for all CPUs yet. In such cases, default to node 0.
		*/
		return (nid < 0) ? 0 : nid;
		}

		#define parent_node(node) (node)

		#define cpumask_of_node(node) ((node) == -1 ? \

+6 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,7 @@ void smp_prepare_boot_cpu(void)
		#ifdef CONFIG_PPC64
		paca[boot_cpuid].__current = current;
		#endif
		set_numa_node(numa_cpu_lookup_table[boot_cpuid]);
		current_set[boot_cpuid] = task_thread_info(current);
		}

		@@ -750,6 +751,11 @@ void start_secondary(void *unused)
		}
		traverse_core_siblings(cpu, true);

		/*
		* numa_node_id() works after this.
		*/
		set_numa_node(numa_cpu_lookup_table[cpu]);

		smp_wmb();
		notify_cpu_starting(cpu);
		set_cpu_online(cpu, true);