Merge branch 'linus' into core/rcu
[linux-2.6-block.git] / arch / sh / kernel / topology.c
CommitLineData
05a11784
PM
1/*
2 * arch/sh/kernel/topology.c
3 *
4 * Copyright (C) 2007 Paul Mundt
5 *
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 */
7a302a96
PM
10#include <linux/cpu.h>
11#include <linux/cpumask.h>
12#include <linux/init.h>
13#include <linux/percpu.h>
d22d9b3a
PM
14#include <linux/node.h>
15#include <linux/nodemask.h>
7a302a96
PM
16
17static DEFINE_PER_CPU(struct cpu, cpu_devices);
18
896f0c0e
PM
19cpumask_t cpu_core_map[NR_CPUS];
20
21static cpumask_t cpu_coregroup_map(unsigned int cpu)
22{
23 /*
24 * Presently all SH-X3 SMP cores are multi-cores, so just keep it
25 * simple until we have a method for determining topology..
26 */
27 return cpu_possible_map;
28}
29
30const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
31{
32 return &cpu_core_map[cpu];
33}
34
35int arch_update_cpu_topology(void)
36{
37 unsigned int cpu;
38
39 for_each_possible_cpu(cpu)
40 cpu_core_map[cpu] = cpu_coregroup_map(cpu);
41
42 return 0;
43}
44
7a302a96
PM
45static int __init topology_init(void)
46{
47 int i, ret;
48
d22d9b3a
PM
49#ifdef CONFIG_NEED_MULTIPLE_NODES
50 for_each_online_node(i)
51 register_one_node(i);
52#endif
53
7a302a96
PM
54 for_each_present_cpu(i) {
55 ret = register_cpu(&per_cpu(cpu_devices, i), i);
56 if (unlikely(ret))
57 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
866e6b9e 58 __func__, i, ret);
7a302a96
PM
59 }
60
05a11784
PM
61#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
62 /*
63 * In the UP case, make sure the CPU association is still
64 * registered under each node. Without this, sysfs fails
65 * to make the connection between nodes other than node0
66 * and cpu0.
67 */
68 for_each_online_node(i)
69 if (i != numa_node_id())
70 register_cpu_under_node(raw_smp_processor_id(), i);
71#endif
72
7a302a96
PM
73 return 0;
74}
75subsys_initcall(topology_init);