linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nathan Fontenot <nfont@austin.ibm.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	linuxppc-dev@lists.ozlabs.org
Cc: Greg KH <greg@kroah.com>,
	steiner@sgi.com, Robin Holt <holt@sgi.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Dave Hansen <dave@linux.vnet.ibm.com>
Subject: [PATCH 1/9] v3 Move find_memory_block routine
Date: Fri, 01 Oct 2010 13:28:39 -0500	[thread overview]
Message-ID: <4CA62857.4030803@austin.ibm.com> (raw)
In-Reply-To: <4CA62700.7010809@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-next/drivers/base/memory.c
===================================================================
--- linux-next.orig/drivers/base/memory.c	2010-09-29 14:56:26.000000000 -0500
+++ linux-next/drivers/base/memory.c	2010-09-30 14:09:36.000000000 -0500
@@ -435,6 +435,37 @@
 	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 @@
 	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)
 {

  reply	other threads:[~2010-10-01 18:28 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-01 18:22 [PATCH 0/9] v3 De-couple sysfs memory directories from memory sections Nathan Fontenot
2010-10-01 18:28 ` Nathan Fontenot [this message]
2010-10-01 18:40   ` [PATCH 1/9] v3 Move find_memory_block routine Robin Holt
2010-10-05  5:01   ` KAMEZAWA Hiroyuki
2010-10-01 18:29 ` [PATCH 2/9] v3 Add mutex for adding/removing memory blocks Nathan Fontenot
2010-10-01 18:45   ` Robin Holt
2010-10-05  5:06   ` KAMEZAWA Hiroyuki
2010-10-01 18:30 ` [PATCH 3/9] v3 Add section count to memory_block struct Nathan Fontenot
2010-10-01 18:46   ` Robin Holt
2010-10-05  5:08   ` KAMEZAWA Hiroyuki
2010-10-01 18:31 ` [PATCH 4/9] v3 Allow memory blocks to span multiple memory sections Nathan Fontenot
2010-10-01 18:52   ` Robin Holt
2010-10-01 18:56     ` Nathan Fontenot
2010-10-01 19:00   ` Nathan Fontenot
2010-10-01 19:20     ` Robin Holt
2010-10-05  5:13     ` KAMEZAWA Hiroyuki
2010-10-01 18:33 ` [PATCH 5/9] v3 rename phys_index properties of memory block struct Nathan Fontenot
2010-10-01 18:54   ` Robin Holt
2010-10-05  5:14   ` KAMEZAWA Hiroyuki
2010-10-01 18:34 ` [PATCH 6/9] v3 Update node sysfs code Nathan Fontenot
2010-10-01 18:55   ` Robin Holt
2010-10-05  5:15   ` KAMEZAWA Hiroyuki
2010-10-01 18:35 ` [PATCH 7/9] v3 Define memory_block_size_bytes for powerpc/pseries Nathan Fontenot
2010-10-01 18:56   ` Robin Holt
2010-10-03 17:55   ` Balbir Singh
2010-10-03 18:07     ` Robin Holt
2010-10-03 18:11       ` Dave Hansen
2010-10-03 18:27         ` Balbir Singh
2010-10-04 14:45           ` Nathan Fontenot
2010-10-01 18:37 ` [PATCH 8/9] v3 Define memory_block_size_bytes for x86_64 with CONFIG_X86_UV set Nathan Fontenot
2010-10-01 18:57   ` Robin Holt
2010-10-01 18:37 ` [PATCH 9/9] v3 Update memory hotplug documentation Nathan Fontenot
2010-10-01 18:58   ` Robin Holt
2010-10-05  5:18   ` KAMEZAWA Hiroyuki
2010-10-21 12:05 ` [PATCH 0/9] v3 De-couple sysfs memory directories from memory sections Nikanth Karthikesan

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=4CA62857.4030803@austin.ibm.com \
    --to=nfont@austin.ibm.com \
    --cc=dave@linux.vnet.ibm.com \
    --cc=greg@kroah.com \
    --cc=holt@sgi.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=steiner@sgi.com \
    /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).