From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e38.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 79CBE1007D2 for ; Wed, 14 Jul 2010 01:47:06 +1000 (EST) Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e38.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o6DFe56l031357 for ; Tue, 13 Jul 2010 09:40:05 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6DFkvVY136876 for ; Tue, 13 Jul 2010 09:46:58 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o6DFkrlt009428 for ; Tue, 13 Jul 2010 09:46:53 -0600 Message-ID: <4C3C8A6B.1030604@austin.ibm.com> Date: Tue, 13 Jul 2010 10:46:51 -0500 From: Nathan Fontenot MIME-Version: 1.0 To: KAMEZAWA Hiroyuki Subject: Re: [PATCH 3/7] Update the [register,unregister]_memory routines References: <4C3B3446.5090302@austin.ibm.com> <4C3B384A.4000902@austin.ibm.com> <20100713152044.7ec8c9ae.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20100713152044.7ec8c9ae.kamezawa.hiroyu@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1 Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 07/13/2010 01:20 AM, KAMEZAWA Hiroyuki wrote: > On Mon, 12 Jul 2010 10:44:10 -0500 > Nathan Fontenot wrote: > >> This patch moves the register/unregister_memory routines to >> avoid a forward declaration. It also moves the sysfs file >> creation and deletion for each directory into the register/ >> unregister routines to avoid duplicating it with these updates. >> >> Signed-off-by: Nathan Fontenot >> --- >> drivers/base/memory.c | 93 +++++++++++++++++++++++++------------------------- >> 1 file changed, 48 insertions(+), 45 deletions(-) >> >> Index: linux-2.6/drivers/base/memory.c >> =================================================================== >> --- linux-2.6.orig/drivers/base/memory.c 2010-07-09 14:23:17.000000000 -0500 >> +++ linux-2.6/drivers/base/memory.c 2010-07-09 14:23:20.000000000 -0500 >> @@ -87,31 +87,6 @@ >> EXPORT_SYMBOL(unregister_memory_isolate_notifier); >> >> /* >> - * register_memory - Setup a sysfs device for a memory block >> - */ >> -static >> -int register_memory(struct memory_block *memory, struct mem_section *section) >> -{ >> - int error; >> - >> - memory->sysdev.cls = &memory_sysdev_class; >> - memory->sysdev.id = __section_nr(section); >> - >> - error = sysdev_register(&memory->sysdev); >> - return error; >> -} >> - >> -static void >> -unregister_memory(struct memory_block *memory) >> -{ >> - BUG_ON(memory->sysdev.cls != &memory_sysdev_class); >> - >> - /* drop the ref. we got in remove_memory_block() */ >> - kobject_put(&memory->sysdev.kobj); >> - sysdev_unregister(&memory->sysdev); >> -} >> - >> -/* >> * use this as the physical section index that this memsection >> * uses. >> */ >> @@ -346,6 +321,53 @@ >> sysdev_remove_file(&mem->sysdev, &attr_##attr_name) >> >> /* >> + * register_memory - Setup a sysfs device for a memory block >> + */ >> +static >> +int register_memory(struct memory_block *memory, struct mem_section *section, >> + int nid, enum mem_add_context context) >> +{ >> + int ret; >> + >> + memory->sysdev.cls = &memory_sysdev_class; >> + memory->sysdev.id = __section_nr(section); >> + > Why not block-ID but section-ID ? Using the beginning section id as the id here makes the splitting of memory_block's easier since we can assume that the id is unique. > > -Kame >