From: Nathan Fontenot <nfont@austin.ibm.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linuxppc-dev@ozlabs.org
Cc: Greg KH <greg@kroah.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Dave Hansen <dave@linux.vnet.ibm.com>
Subject: [PATCH 1/9] v4 Move the find_memory_block() routine up
Date: Tue, 03 Aug 2010 08:36:39 -0500 [thread overview]
Message-ID: <4C581B67.1010202@austin.ibm.com> (raw)
In-Reply-To: <4C581A6D.9030908@austin.ibm.com>
Move the find_memory_block() routine up to avoid needing a forward
declaration in subsequent patches.
Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
---
drivers/base/memory.c | 62 +++++++++++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
Index: linux-2.6/drivers/base/memory.c
===================================================================
--- linux-2.6.orig/drivers/base/memory.c 2010-08-02 13:23:51.000000000 -0500
+++ linux-2.6/drivers/base/memory.c 2010-08-02 13:32:21.000000000 -0500
@@ -435,6 +435,37 @@ int __weak arch_get_memory_phys_device(u
return 0;
}
+/*
+ * For now, we have a linear search to go find the appropriate
+ * memory_block corresponding to a particular phys_index. If
+ * this gets to be a real problem, we can always use a radix
+ * tree or something here.
+ *
+ * This could be made generic for all sysdev classes.
+ */
+struct memory_block *find_memory_block(struct mem_section *section)
+{
+ struct kobject *kobj;
+ struct sys_device *sysdev;
+ struct memory_block *mem;
+ char name[sizeof(MEMORY_CLASS_NAME) + 9 + 1];
+
+ /*
+ * This only works because we know that section == sysdev->id
+ * slightly redundant with sysdev_register()
+ */
+ sprintf(&name[0], "%s%d", MEMORY_CLASS_NAME, __section_nr(section));
+
+ kobj = kset_find_obj(&memory_sysdev_class.kset, name);
+ if (!kobj)
+ return NULL;
+
+ sysdev = container_of(kobj, struct sys_device, kobj);
+ mem = container_of(sysdev, struct memory_block, sysdev);
+
+ return mem;
+}
+
static int add_memory_block(int nid, struct mem_section *section,
unsigned long state, enum mem_add_context context)
{
@@ -468,37 +499,6 @@ static int add_memory_block(int nid, str
return ret;
}
-/*
- * For now, we have a linear search to go find the appropriate
- * memory_block corresponding to a particular phys_index. If
- * this gets to be a real problem, we can always use a radix
- * tree or something here.
- *
- * This could be made generic for all sysdev classes.
- */
-struct memory_block *find_memory_block(struct mem_section *section)
-{
- struct kobject *kobj;
- struct sys_device *sysdev;
- struct memory_block *mem;
- char name[sizeof(MEMORY_CLASS_NAME) + 9 + 1];
-
- /*
- * This only works because we know that section == sysdev->id
- * slightly redundant with sysdev_register()
- */
- sprintf(&name[0], "%s%d", MEMORY_CLASS_NAME, __section_nr(section));
-
- kobj = kset_find_obj(&memory_sysdev_class.kset, name);
- if (!kobj)
- return NULL;
-
- sysdev = container_of(kobj, struct sys_device, kobj);
- mem = container_of(sysdev, struct memory_block, sysdev);
-
- return mem;
-}
-
int remove_memory_block(unsigned long node_id, struct mem_section *section,
int phys_device)
{
next prev parent reply other threads:[~2010-08-03 13:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-03 13:32 [PATCH 0/9] v4 De-couple sysfs memory directories from memory sections Nathan Fontenot
2010-08-03 13:36 ` Nathan Fontenot [this message]
2010-08-05 4:45 ` [PATCH 1/9] v4 Move the find_memory_block() routine up KAMEZAWA Hiroyuki
2010-08-03 13:37 ` [PATCH 2/9] v4 Add new phys_index properties Nathan Fontenot
2010-08-05 4:49 ` KAMEZAWA Hiroyuki
2010-08-03 13:38 ` [PATCH 3/9] v4 Add section count to memory_block Nathan Fontenot
2010-08-05 4:50 ` KAMEZAWA Hiroyuki
2010-08-03 13:39 ` [PATCH 4/9] v4 Add mutex for add/remove of memory blocks Nathan Fontenot
2010-08-05 4:53 ` KAMEZAWA Hiroyuki
2010-08-09 13:55 ` Nathan Fontenot
2010-08-03 13:40 ` [PATCH 5/9] v4 Allow memory_block to span multiple memory sections Nathan Fontenot
2010-08-05 4:55 ` KAMEZAWA Hiroyuki
2010-08-03 13:41 ` [PATCH 6/9] v4 Update the find_memory_block declaration Nathan Fontenot
2010-08-05 4:59 ` KAMEZAWA Hiroyuki
2010-08-09 13:56 ` Nathan Fontenot
2010-08-03 13:42 ` [PATCH 7/9] v4 Update the node sysfs code Nathan Fontenot
2010-08-05 5:01 ` KAMEZAWA Hiroyuki
2010-08-03 13:43 ` [PATCH 8/9] v4 Define memory_block_size_bytes() for ppc/pseries Nathan Fontenot
2010-08-03 13:44 ` [PATCH 9/9] v4 Update memory-hotplug documentation Nathan Fontenot
2010-08-05 5:04 ` KAMEZAWA Hiroyuki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C581B67.1010202@austin.ibm.com \
--to=nfont@austin.ibm.com \
--cc=dave@linux.vnet.ibm.com \
--cc=greg@kroah.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).