Merge branch 'akpm'
[linux-2.6/next.git] / arch / sh / kernel / topology.c
blobab37955b453a592f5034bb4eb8f89ff055764fd8
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>
16 #include <linux/export.h>
18 static DEFINE_PER_CPU(struct cpu, cpu_devices);
20 cpumask_t cpu_core_map[NR_CPUS];
21 EXPORT_SYMBOL(cpu_core_map);
23 static cpumask_t cpu_coregroup_map(unsigned int cpu)
26 * Presently all SH-X3 SMP cores are multi-cores, so just keep it
27 * simple until we have a method for determining topology..
29 return cpu_possible_map;
32 const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
34 return &cpu_core_map[cpu];
37 int arch_update_cpu_topology(void)
39 unsigned int cpu;
41 for_each_possible_cpu(cpu)
42 cpu_core_map[cpu] = cpu_coregroup_map(cpu);
44 return 0;
47 static int __init topology_init(void)
49 int i, ret;
51 #ifdef CONFIG_NEED_MULTIPLE_NODES
52 for_each_online_node(i)
53 register_one_node(i);
54 #endif
56 for_each_present_cpu(i) {
57 struct cpu *c = &per_cpu(cpu_devices, i);
59 c->hotpluggable = 1;
61 ret = register_cpu(c, i);
62 if (unlikely(ret))
63 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
64 __func__, i, ret);
67 #if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
69 * In the UP case, make sure the CPU association is still
70 * registered under each node. Without this, sysfs fails
71 * to make the connection between nodes other than node0
72 * and cpu0.
74 for_each_online_node(i)
75 if (i != numa_node_id())
76 register_cpu_under_node(raw_smp_processor_id(), i);
77 #endif
79 return 0;
81 subsys_initcall(topology_init);