Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / arch / sh / kernel / topology.c
blob38e862852dd0ce3fbcd10e9291c09fd35e6699d4
1 /*
2 * arch/sh/kernel/topology.c
4 * Copyright (C) 2007 Paul Mundt
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
10 #include <linux/cpu.h>
11 #include <linux/cpumask.h>
12 #include <linux/init.h>
13 #include <linux/percpu.h>
14 #include <linux/node.h>
15 #include <linux/nodemask.h>
17 static DEFINE_PER_CPU(struct cpu, cpu_devices);
19 cpumask_t cpu_core_map[NR_CPUS];
20 EXPORT_SYMBOL(cpu_core_map);
22 static cpumask_t cpu_coregroup_map(unsigned int cpu)
25 * Presently all SH-X3 SMP cores are multi-cores, so just keep it
26 * simple until we have a method for determining topology..
28 return cpu_possible_map;
31 const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
33 return &cpu_core_map[cpu];
36 int arch_update_cpu_topology(void)
38 unsigned int cpu;
40 for_each_possible_cpu(cpu)
41 cpu_core_map[cpu] = cpu_coregroup_map(cpu);
43 return 0;
46 static int __init topology_init(void)
48 int i, ret;
50 #ifdef CONFIG_NEED_MULTIPLE_NODES
51 for_each_online_node(i)
52 register_one_node(i);
53 #endif
55 for_each_present_cpu(i) {
56 struct cpu *c = &per_cpu(cpu_devices, i);
58 c->hotpluggable = 1;
60 ret = register_cpu(c, i);
61 if (unlikely(ret))
62 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
63 __func__, i, ret);
66 #if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
68 * In the UP case, make sure the CPU association is still
69 * registered under each node. Without this, sysfs fails
70 * to make the connection between nodes other than node0
71 * and cpu0.
73 for_each_online_node(i)
74 if (i != numa_node_id())
75 register_cpu_under_node(raw_smp_processor_id(), i);
76 #endif
78 return 0;
80 subsys_initcall(topology_init);