Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / arch / sh / kernel / topology.c
blobe9cfd87f0295331e11c1f66476ebacf80c722916
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 static int __init topology_init(void)
21 int i, ret;
23 #ifdef CONFIG_NEED_MULTIPLE_NODES
24 for_each_online_node(i)
25 register_one_node(i);
26 #endif
28 for_each_present_cpu(i) {
29 ret = register_cpu(&per_cpu(cpu_devices, i), i);
30 if (unlikely(ret))
31 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
32 <<<<<<< HEAD:arch/sh/kernel/topology.c
33 __FUNCTION__, i, ret);
34 =======
35 __func__, i, ret);
36 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/sh/kernel/topology.c
39 #if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
41 * In the UP case, make sure the CPU association is still
42 * registered under each node. Without this, sysfs fails
43 * to make the connection between nodes other than node0
44 * and cpu0.
46 for_each_online_node(i)
47 if (i != numa_node_id())
48 register_cpu_under_node(raw_smp_processor_id(), i);
49 #endif
51 return 0;
53 subsys_initcall(topology_init);