aboutsummaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-06-07 11:29:37 +0900
committerPaul Mundt <lethal@hera.kernel.org>2007-06-08 02:43:50 +0000
commit05a117847b43d44f336bbf272a1063661431a5e5 (patch)
tree7eaf33d0e1964c9bea59dcba4bdedbc5f76b2366 /arch/sh
parent5bbeafca8d5c64b6d9c6653993492d763be0918f (diff)
downloadlinux-2.6.34-ux500-05a117847b43d44f336bbf272a1063661431a5e5.tar.gz
sh: Fix up cpu to node mapping in sysfs.
Currently cpu_to_node() is always 0 in the UP case, though we do want to have the CPU association linked in under sysfs even in the cases where we're only on a single CPU. Fix this up, so we have the cpu0 link on all of the available nodes that don't already have a CPU link of their own. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/topology.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c
index 9687b02caf4..9b5844a1bda 100644
--- a/arch/sh/kernel/topology.c
+++ b/arch/sh/kernel/topology.c
@@ -1,3 +1,12 @@
+/*
+ * arch/sh/kernel/topology.c
+ *
+ * Copyright (C) 2007 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
#include <linux/cpu.h>
#include <linux/cpumask.h>
#include <linux/init.h>
@@ -23,6 +32,18 @@ static int __init topology_init(void)
__FUNCTION__, i, ret);
}
+#if defined(CONFIG_NUMA) && !defined(CONFIG_SMP)
+ /*
+ * In the UP case, make sure the CPU association is still
+ * registered under each node. Without this, sysfs fails
+ * to make the connection between nodes other than node0
+ * and cpu0.
+ */
+ for_each_online_node(i)
+ if (i != numa_node_id())
+ register_cpu_under_node(raw_smp_processor_id(), i);
+#endif
+
return 0;
}
subsys_initcall(topology_init);