x86: change NR_CPUS arrays in numa_64 (df3825c5) · Commits · 戴 / test

arch/x86/kernel/setup_64.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@
		#include <asm/cacheflush.h>
		#include <asm/mce.h>
		#include <asm/ds.h>
		#include <asm/topology.h>

		#ifdef CONFIG_PARAVIRT
		#include <asm/paravirt.h>
		@@ -359,8 +360,9 @@ void __init setup_arch(char **cmdline_p)
		io_delay_init();

		#ifdef CONFIG_SMP
		/* setup to use the static apicid table during kernel startup */
		/* setup to use the early static init tables during kernel startup */
		x86_cpu_to_apicid_early_ptr = (void *)&x86_cpu_to_apicid_init;
		x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
		#endif

		#ifdef CONFIG_ACPI

+5 −1

Original line number	Diff line number	Diff line
		@@ -861,9 +861,12 @@ void __init smp_set_apicids(void)
		int cpu;

		for_each_possible_cpu(cpu) {
		if (per_cpu_offset(cpu))
		if (per_cpu_offset(cpu)) {
		per_cpu(x86_cpu_to_apicid, cpu) =
		x86_cpu_to_apicid_init[cpu];
		per_cpu(x86_cpu_to_node_map, cpu) =
		x86_cpu_to_node_map_init[cpu];
		}
		else
		printk(KERN_NOTICE "per_cpu_offset zero for cpu %d\n",
		cpu);
		@@ -871,6 +874,7 @@ void __init smp_set_apicids(void)

		/* indicate the early static arrays are gone */
		x86_cpu_to_apicid_early_ptr = NULL;
		x86_cpu_to_node_map_early_ptr = NULL;
		}

		static void __init smp_cpu_index_default(void)

+16 −4

Original line number	Diff line number	Diff line
		@@ -31,10 +31,14 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES];

		struct memnode memnode;

		u16 cpu_to_node_map[NR_CPUS] __read_mostly = {
		u16 x86_cpu_to_node_map_init[NR_CPUS] __initdata = {
		[0 ... NR_CPUS-1] = NUMA_NO_NODE
		};
		EXPORT_SYMBOL(cpu_to_node_map);
		void *x86_cpu_to_node_map_early_ptr;
		EXPORT_SYMBOL(x86_cpu_to_node_map_init);
		EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr);
		DEFINE_PER_CPU(u16, x86_cpu_to_node_map) = NUMA_NO_NODE;
		EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map);

		u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
		[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
		@@ -544,7 +548,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
		node_set(0, node_possible_map);
		for (i = 0; i < NR_CPUS; i++)
		numa_set_node(i, 0);
		/* we can't use cpumask_of_cpu() yet */
		/* cpumask_of_cpu() may not be available during early startup */
		memset(&node_to_cpumask_map[0], 0, sizeof(node_to_cpumask_map[0]));
		cpu_set(0, node_to_cpumask_map[0]);
		e820_register_active_regions(0, start_pfn, end_pfn);
		@@ -558,8 +562,16 @@ __cpuinit void numa_add_cpu(int cpu)

		void __cpuinit numa_set_node(int cpu, int node)
		{
		u16 cpu_to_node_map = (u16 )x86_cpu_to_node_map_early_ptr;

		cpu_pda(cpu)->nodenumber = node;

		if(cpu_to_node_map)
		cpu_to_node_map[cpu] = node;
		else if(per_cpu_offset(cpu))
		per_cpu(x86_cpu_to_node_map, cpu) = node;
		else
		Dprintk(KERN_INFO "Setting node for non-present cpu %d\n", cpu);
		}

		unsigned long __init numa_free_all_bootmem(void)

+0 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,4 @@ static inline void clear_node_cpumask(int cpu)
		#define clear_node_cpumask(cpu) do {} while (0)
		#endif

		#define NUMA_NO_NODE 0xffff

		#endif

+13 −2

Original line number	Diff line number	Diff line
		@@ -30,13 +30,24 @@
		#include <asm/mpspec.h>

		/* Mappings between logical cpu number and node number */
		extern u16 cpu_to_node_map[];
		DECLARE_PER_CPU(u16, x86_cpu_to_node_map);
		extern u16 __initdata x86_cpu_to_node_map_init[];
		extern void *x86_cpu_to_node_map_early_ptr;
		extern cpumask_t node_to_cpumask_map[];

		#define NUMA_NO_NODE ((u16)(~0))

		/* Returns the number of the node containing CPU 'cpu' */
		static inline int cpu_to_node(int cpu)
		{
		u16 cpu_to_node_map = (u16 )x86_cpu_to_node_map_early_ptr;

		if (cpu_to_node_map)
		return cpu_to_node_map[cpu];
		else if (per_cpu_offset(cpu))
		return per_cpu(x86_cpu_to_node_map, cpu);
		else
		return NUMA_NO_NODE;
		}

		/*