diff options
-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 650001a87c8f..bc6dd5051d60 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/ctype.h> | 11 | #include <linux/ctype.h> |
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/nodemask.h> | 13 | #include <linux/nodemask.h> |
14 | #include <linux/sched.h> | ||
14 | 15 | ||
15 | #include <asm/e820.h> | 16 | #include <asm/e820.h> |
16 | #include <asm/proto.h> | 17 | #include <asm/proto.h> |
@@ -30,12 +31,12 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES]; | |||
30 | 31 | ||
31 | struct memnode memnode; | 32 | struct memnode memnode; |
32 | 33 | ||
33 | int cpu_to_node_map[NR_CPUS] __read_mostly = { | 34 | u16 cpu_to_node_map[NR_CPUS] __read_mostly = { |
34 | [0 ... NR_CPUS-1] = NUMA_NO_NODE | 35 | [0 ... NR_CPUS-1] = NUMA_NO_NODE |
35 | }; | 36 | }; |
36 | EXPORT_SYMBOL(cpu_to_node_map); | 37 | EXPORT_SYMBOL(cpu_to_node_map); |
37 | 38 | ||
38 | unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { | 39 | u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { |
39 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE | 40 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE |
40 | }; | 41 | }; |
41 | 42 | ||
@@ -543,7 +544,9 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) | |||
543 | node_set(0, node_possible_map); | 544 | node_set(0, node_possible_map); |
544 | for (i = 0; i < NR_CPUS; i++) | 545 | for (i = 0; i < NR_CPUS; i++) |
545 | numa_set_node(i, 0); | 546 | numa_set_node(i, 0); |
546 | node_to_cpumask_map[0] = cpumask_of_cpu(0); | 547 | /* we can't use cpumask_of_cpu() yet */ |
548 | memset(&node_to_cpumask_map[0], 0, sizeof(node_to_cpumask_map[0])); | ||
549 | cpu_set(0, node_to_cpumask_map[0]); | ||
547 | e820_register_active_regions(0, start_pfn, end_pfn); | 550 | e820_register_active_regions(0, start_pfn, end_pfn); |
548 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT); | 551 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT); |
549 | } | 552 | } |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index b367bc342fe0..bccbdc7be434 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) | |||
391 | static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = { | 391 | static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = { |
392 | [0 ... MAX_NUMNODES-1] = PXM_INVAL | 392 | [0 ... MAX_NUMNODES-1] = PXM_INVAL |
393 | }; | 393 | }; |
394 | static unsigned char fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = { | 394 | static u16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = { |
395 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE | 395 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE |
396 | }; | 396 | }; |
397 | static int __init find_node_by_addr(unsigned long addr) | 397 | 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 4449889bb0c0..941889471b52 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); | |||
20 | extern void srat_reserve_add_area(int nodeid); | 20 | extern void srat_reserve_add_area(int nodeid); |
21 | extern int hotadd_percent; | 21 | extern int hotadd_percent; |
22 | 22 | ||
23 | extern unsigned char apicid_to_node[MAX_LOCAL_APIC]; | 23 | extern u16 apicid_to_node[MAX_LOCAL_APIC]; |
24 | 24 | ||
25 | extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn); | 25 | extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn); |
26 | extern unsigned long numa_free_all_bootmem(void); | 26 | extern unsigned long numa_free_all_bootmem(void); |
@@ -40,6 +40,6 @@ static inline void clear_node_cpumask(int cpu) | |||
40 | #define clear_node_cpumask(cpu) do {} while (0) | 40 | #define clear_node_cpumask(cpu) do {} while (0) |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #define NUMA_NO_NODE 0xff | 43 | #define NUMA_NO_NODE 0xffff |
44 | 44 | ||
45 | #endif | 45 | #endif |
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h index 9c251604ecc4..f8706b2a3d88 100644 --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mpspec.h> | 30 | #include <asm/mpspec.h> |
31 | 31 | ||
32 | /* Mappings between logical cpu number and node number */ | 32 | /* Mappings between logical cpu number and node number */ |
33 | extern int cpu_to_node_map[]; | 33 | extern u16 cpu_to_node_map[]; |
34 | extern cpumask_t node_to_cpumask_map[]; | 34 | extern cpumask_t node_to_cpumask_map[]; |
35 | 35 | ||
36 | /* Returns the number of the node containing CPU 'cpu' */ | 36 | /* Returns the number of the node containing CPU 'cpu' */ |