x86: Unify cpu/apicid <-> NUMA node mapping between 32 and 64bit
[linux-block.git] / arch / x86 / mm / numa.c
CommitLineData
71ee73e7
RR
1/* Common code for 32 and 64-bit NUMA */
2#include <linux/topology.h>
3#include <linux/module.h>
4#include <linux/bootmem.h>
90321602
JB
5#include <asm/numa.h>
6#include <asm/acpi.h>
7
8int __initdata numa_off;
9
10static __init int numa_setup(char *opt)
11{
12 if (!opt)
13 return -EINVAL;
14 if (!strncmp(opt, "off", 3))
15 numa_off = 1;
16#ifdef CONFIG_NUMA_EMU
17 if (!strncmp(opt, "fake=", 5))
18 numa_emu_cmdline(opt + 5);
19#endif
20#ifdef CONFIG_ACPI_NUMA
21 if (!strncmp(opt, "noacpi", 6))
22 acpi_numa = -1;
23#endif
24 return 0;
25}
26early_param("numa", numa_setup);
71ee73e7 27
71ee73e7 28/*
bbc9e2f4 29 * apicid, cpu, node mappings
71ee73e7 30 */
bbc9e2f4
TH
31s16 __apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
32 [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
33};
34
c032ef60 35cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
71ee73e7
RR
36EXPORT_SYMBOL(node_to_cpumask_map);
37
38/*
39 * Allocate node_to_cpumask_map based on number of available nodes
40 * Requires node_possible_map to be valid.
41 *
42 * Note: node_to_cpumask() is not valid until after this is done.
43 * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.)
44 */
45void __init setup_node_to_cpumask_map(void)
46{
47 unsigned int node, num = 0;
71ee73e7
RR
48
49 /* setup nr_node_ids if not done yet */
50 if (nr_node_ids == MAX_NUMNODES) {
51 for_each_node_mask(node, node_possible_map)
52 num = node;
53 nr_node_ids = num + 1;
54 }
55
56 /* allocate the map */
c032ef60
RR
57 for (node = 0; node < nr_node_ids; node++)
58 alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
71ee73e7 59
c032ef60
RR
60 /* cpumask_of_node() will now work */
61 pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);
71ee73e7
RR
62}
63
64#ifdef CONFIG_DEBUG_PER_CPU_MAPS
65/*
66 * Returns a pointer to the bitmask of CPUs on Node 'node'.
67 */
73e907de 68const struct cpumask *cpumask_of_node(int node)
71ee73e7 69{
71ee73e7
RR
70 if (node >= nr_node_ids) {
71 printk(KERN_WARNING
72 "cpumask_of_node(%d): node > nr_node_ids(%d)\n",
73 node, nr_node_ids);
74 dump_stack();
75 return cpu_none_mask;
76 }
c032ef60
RR
77 if (node_to_cpumask_map[node] == NULL) {
78 printk(KERN_WARNING
79 "cpumask_of_node(%d): no node_to_cpumask_map!\n",
80 node);
81 dump_stack();
82 return cpu_online_mask;
83 }
0b966252 84 return node_to_cpumask_map[node];
71ee73e7
RR
85}
86EXPORT_SYMBOL(cpumask_of_node);
87#endif