Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
[linux-2.6.git] / arch / metag / kernel / topology.c
blobbec3dec4922e689d307cd9092a41aa5308c13ad1
1 /*
2 * Copyright (C) 2007 Paul Mundt
3 * Copyright (C) 2010 Imagination Technolohies Ltd.
5 * This file is subject to the terms and conditions of the GNU General Public
6 * License. See the file "COPYING" in the main directory of this archive
7 * for more details.
8 */
9 #include <linux/cpu.h>
10 #include <linux/cpumask.h>
11 #include <linux/init.h>
12 #include <linux/percpu.h>
13 #include <linux/node.h>
14 #include <linux/nodemask.h>
15 #include <linux/topology.h>
17 #include <asm/cpu.h>
19 DEFINE_PER_CPU(struct cpuinfo_metag, cpu_data);
21 cpumask_t cpu_core_map[NR_CPUS];
23 static cpumask_t cpu_coregroup_map(unsigned int cpu)
25 return *cpu_possible_mask;
28 const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
30 return &cpu_core_map[cpu];
33 int arch_update_cpu_topology(void)
35 unsigned int cpu;
37 for_each_possible_cpu(cpu)
38 cpu_core_map[cpu] = cpu_coregroup_map(cpu);
40 return 0;
43 static int __init topology_init(void)
45 int i, ret;
47 #ifdef CONFIG_NEED_MULTIPLE_NODES
48 for_each_online_node(i)
49 register_one_node(i);
50 #endif
52 for_each_present_cpu(i) {
53 struct cpuinfo_metag *cpuinfo = &per_cpu(cpu_data, i);
54 #ifdef CONFIG_HOTPLUG_CPU
55 cpuinfo->cpu.hotpluggable = 1;
56 #endif
57 ret = register_cpu(&cpuinfo->cpu, i);
58 if (unlikely(ret))
59 pr_warn("%s: register_cpu %d failed (%d)\n",
60 __func__, i, ret);
63 #if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
65 * In the UP case, make sure the CPU association is still
66 * registered under each node. Without this, sysfs fails
67 * to make the connection between nodes other than node0
68 * and cpu0.
70 for_each_online_node(i)
71 if (i != numa_node_id())
72 register_cpu_under_node(raw_smp_processor_id(), i);
73 #endif
75 return 0;
77 subsys_initcall(topology_init);