diff options
| author | travis@sgi.com <travis@sgi.com> | 2008-01-30 13:33:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:11 +0100 |
| commit | 3cc87e3f4042a099fb649c5df33d3ccfae36173f (patch) | |
| tree | 05ec0a543e4e3406d64a39a9de86d247c707472f | |
| parent | ef97001f3d869d7cc1956e0cc0d89e514e3f7db0 (diff) | |
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: Mike Travis <travis@sgi.com>
Reviewed-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/mm/numa_64.c | 9 | ||||
| -rw-r--r-- | arch/x86/mm/srat_64.c | 2 | ||||
| -rw-r--r-- | include/asm-x86/numa_64.h | 4 | ||||
| -rw-r--r-- | include/asm-x86/topology.h | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 650001a87c8..bc6dd5051d6 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -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); } diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index b367bc342fe..bccbdc7be43 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -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) diff --git a/include/asm-x86/numa_64.h b/include/asm-x86/numa_64.h index 4449889bb0c..941889471b5 100644 --- a/include/asm-x86/numa_64.h +++ b/include/asm-x86/numa_64.h @@ -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 diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 9c251604ecc..f8706b2a3d8 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -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' */ |