Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe21a445 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: adjust numa 32 namespace 



Use the 64bit numa variable names for numa32 as well.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7462894a

arch/x86/kernel/smpboot_32.c

+8 −8
Original line number Diff line number Diff line
@@ -466,19 +466,19 @@ extern struct { 
#ifdef CONFIG_NUMA



/* which logical CPUs are on which nodes */

cpumask_t node_2_cpu_mask[MAX_NUMNODES] __read_mostly =

cpumask_t node_to_cpumask_map[MAX_NUMNODES] __read_mostly =

				{ [0 ... MAX_NUMNODES-1] = CPU_MASK_NONE };

EXPORT_SYMBOL(node_2_cpu_mask);

EXPORT_SYMBOL(node_to_cpumask_map);

/* which node each logical CPU is on */

int cpu_2_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 };

EXPORT_SYMBOL(cpu_2_node);

int cpu_to_node_map[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 };

EXPORT_SYMBOL(cpu_to_node_map);



/* set up a mapping between cpu and node. */

static inline void map_cpu_to_node(int cpu, int node)

{

	printk("Mapping cpu %d to node %d\n", cpu, node);

	cpu_set(cpu, node_2_cpu_mask[node]);

	cpu_2_node[cpu] = node;

	cpu_set(cpu, node_to_cpumask_map[node]);

	cpu_to_node_map[cpu] = node;

}



/* undo a mapping between cpu and node. */
@@ -488,8 +488,8 @@ static inline void unmap_cpu_to_node(int cpu) 


	printk("Unmapping cpu %d from all nodes\n", cpu);

	for (node = 0; node < MAX_NUMNODES; node ++)

		cpu_clear(cpu, node_2_cpu_mask[node]);

	cpu_2_node[cpu] = 0;

		cpu_clear(cpu, node_to_cpumask_map[node]);

	cpu_to_node_map[cpu] = 0;

}

#else /* !CONFIG_NUMA */

include/asm-x86/topology_32.h

+4 −4
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ 
#include <linux/cpumask.h>



/* Mappings between logical cpu number and node number */

extern cpumask_t node_2_cpu_mask[];

extern int cpu_2_node[];

extern cpumask_t node_to_cpumask_map[];

extern int cpu_to_node_map[];



/* Returns the number of the node containing CPU 'cpu' */

static inline int cpu_to_node(int cpu)

{ 

	return cpu_2_node[cpu];

	return cpu_to_node_map[cpu];

}



/* Returns the number of the node containing Node 'node'.  This architecture is flat,
@@ -55,7 +55,7 @@ static inline int cpu_to_node(int cpu) 
/* Returns a bitmask of CPUs on Node 'node'. */

static inline cpumask_t node_to_cpumask(int node)

{

	return node_2_cpu_mask[node];

	return node_to_cpumask_map[node];

}



/* Returns the number of the first CPU on Node 'node'. */