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

Commit 3cc87e3f authored by travis@sgi.com's avatar travis@sgi.com Committed by Ingo Molnar
Browse files

x86: change size of node ids from u8 to u16 



Change the size of node ids from 8 bits to 16 bits to
accomodate more than 256 nodes.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ef97001f

arch/x86/mm/numa_64.c

+6 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/ctype.h>

#include <linux/module.h>

#include <linux/nodemask.h>

#include <linux/sched.h>



#include <asm/e820.h>

#include <asm/proto.h>
@@ -30,12 +31,12 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES]; 


struct memnode memnode;



int cpu_to_node_map[NR_CPUS] __read_mostly = {

u16 cpu_to_node_map[NR_CPUS] __read_mostly = {

	[0 ... NR_CPUS-1] = NUMA_NO_NODE

};

EXPORT_SYMBOL(cpu_to_node_map);



unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {

u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {

	[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

};
@@ -543,7 +544,9 @@ 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);

	node_to_cpumask_map[0] = cpumask_of_cpu(0);

	/* we can't use cpumask_of_cpu() yet */

	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);

	setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT);

}

arch/x86/mm/srat_64.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) 
static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = {

	[0 ... MAX_NUMNODES-1] = PXM_INVAL

};

static unsigned char fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = {

static u16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = {

	[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

};

static int __init find_node_by_addr(unsigned long addr)

include/asm-x86/numa_64.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ extern void numa_set_node(int cpu, int node); 
extern void srat_reserve_add_area(int nodeid);

extern int hotadd_percent;



extern unsigned char apicid_to_node[MAX_LOCAL_APIC];

extern u16 apicid_to_node[MAX_LOCAL_APIC];



extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);

extern unsigned long numa_free_all_bootmem(void);
@@ -40,6 +40,6 @@ static inline void clear_node_cpumask(int cpu) 
#define clear_node_cpumask(cpu) do {} while (0)

#endif



#define NUMA_NO_NODE 0xff

#define NUMA_NO_NODE 0xffff



#endif

include/asm-x86/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <asm/mpspec.h>



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

extern int cpu_to_node_map[];

extern u16 cpu_to_node_map[];

extern cpumask_t node_to_cpumask_map[];



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