Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=05a117847b43d44f336bbf272a1063661431a5e5 Commit: 05a117847b43d44f336bbf272a1063661431a5e5 Parent: 5bbeafca8d5c64b6d9c6653993492d763be0918f Author: Paul Mundt <[EMAIL PROTECTED]> AuthorDate: Thu Jun 7 11:29:37 2007 +0900 Committer: Paul Mundt <[EMAIL PROTECTED]> CommitDate: Fri Jun 8 02:43:50 2007 +0000
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 <[EMAIL PROTECTED]> --- arch/sh/kernel/topology.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c index 9687b02..9b5844a 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); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html