Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
[deliverable/linux.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 19cpumask_t cpu_core_map[NR_CPUS];
24ee7d79 20EXPORT_SYMBOL(cpu_core_map);
896f0c0e
PM
21
22static cpumask_t cpu_coregroup_map(unsigned int cpu)
23{
24 /*
25 * Presently all SH-X3 SMP cores are multi-cores, so just keep it
26 * simple until we have a method for determining topology..
27 */
28 return cpu_possible_map;
29}
30
31const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
32{
33 return &cpu_core_map[cpu];
34}
35
36int arch_update_cpu_topology(void)
37{
38 unsigned int cpu;
39
40 for_each_possible_cpu(cpu)
41 cpu_core_map[cpu] = cpu_coregroup_map(cpu);
42
43 return 0;
44}
45
7a302a96
PM
46static int __init topology_init(void)
47{
48 int i, ret;
49
d22d9b3a
PM
50#ifdef CONFIG_NEED_MULTIPLE_NODES
51 for_each_online_node(i)
52 register_one_node(i);
53#endif
54
7a302a96 55 for_each_present_cpu(i) {
9e8c5be8
PM
56 struct cpu *c = &per_cpu(cpu_devices, i);
57
58 c->hotpluggable = 1;
59
60 ret = register_cpu(c, i);
7a302a96
PM
61 if (unlikely(ret))
62 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
866e6b9e 63 __func__, i, ret);
7a302a96
PM
64 }
65
05a11784
PM
66#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
67 /*
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.
72 */
73 for_each_online_node(i)
74 if (i != numa_node_id())
75 register_cpu_under_node(raw_smp_processor_id(), i);
76#endif
77
7a302a96
PM
78 return 0;
79}
80subsys_initcall(topology_init);
This page took 0.329757 seconds and 5 git commands to generate.