Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756940Ab0GMPrO (ORCPT ); Tue, 13 Jul 2010 11:47:14 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:40028 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756807Ab0GMPrN (ORCPT ); Tue, 13 Jul 2010 11:47:13 -0400 Message-ID: <4C3C8A6B.1030604@austin.ibm.com> Date: Tue, 13 Jul 2010 10:46:51 -0500 From: Nathan Fontenot User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.10) Gecko/20100527 Thunderbird/3.0.5 MIME-Version: 1.0 To: KAMEZAWA Hiroyuki CC: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org 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 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2575 Lines: 80 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 > -- 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/