Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964824AbWBQNbY (ORCPT ); Fri, 17 Feb 2006 08:31:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964913AbWBQNao (ORCPT ); Fri, 17 Feb 2006 08:30:44 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:58074 "EHLO fgwmail7.fujitsu.co.jp") by vger.kernel.org with ESMTP id S964824AbWBQNaY (ORCPT ); Fri, 17 Feb 2006 08:30:24 -0500 Date: Fri, 17 Feb 2006 22:29:20 +0900 From: Yasunori Goto To: Andrew Morton Subject: [PATCH: 007/012] Memory hotplug for new nodes v.2.(create sysfs for node (x86-64)) Cc: "Luck, Tony" , Andi Kleen , "Tolentino, Matthew E" , Joel Schopp , Dave Hansen , Linux Kernel ML , linux-ia64@vger.kernel.org, x86-64 Discuss X-Mailer-Plugin: BkASPil for Becky!2 Ver.2.063 Message-Id: <20060217213414.4076.Y-GOTO@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.24.02 [ja] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2091 Lines: 75 This patch is to use arch_register_node() on "x86-64". x86-64 uses i386's topology.c Howerver, arch_register_node() is written at include/asm-i386/node.c. x86-64 couldn't use it. I suppose there is no reason that it must be defined as inline function. So, I move it to topology.c. Index: pgdat3/arch/i386/mach-default/topology.c =================================================================== --- pgdat3.orig/arch/i386/mach-default/topology.c 2005-10-28 12:04:38.000000000 +0900 +++ pgdat3/arch/i386/mach-default/topology.c 2006-02-17 16:17:30.000000000 +0900 @@ -69,6 +69,26 @@ EXPORT_SYMBOL(arch_unregister_cpu); struct i386_node node_devices[MAX_NUMNODES]; +int arch_register_node(int num) +{ + int p_node; + struct node *parent = NULL; + + if (!node_online(num)) + return 0; + p_node = parent_node(num); + + if (p_node != num) + parent = &node_devices[p_node].node; + + return register_node(&node_devices[num].node, num, parent); +} + +void arch_unregister_node(int num) +{ + unregister_node(&node_devices[num].node); +} + static int __init topology_init(void) { int i; Index: pgdat3/include/asm-i386/node.h =================================================================== --- pgdat3.orig/include/asm-i386/node.h 2005-03-02 16:37:51.000000000 +0900 +++ pgdat3/include/asm-i386/node.h 2006-02-17 16:17:30.000000000 +0900 @@ -11,19 +11,6 @@ struct i386_node { struct node node; }; extern struct i386_node node_devices[MAX_NUMNODES]; - -static inline int arch_register_node(int num){ - int p_node; - struct node *parent = NULL; - - if (!node_online(num)) - return 0; - p_node = parent_node(num); - - if (p_node != num) - parent = &node_devices[p_node].node; - - return register_node(&node_devices[num].node, num, parent); -} +extern int arch_register_node(int); #endif /* _ASM_I386_NODE_H_ */ -- Yasunori Goto - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/