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@ozlabs.org
Cc: greg@kroah.com, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Subject: [PATCH 1/8] v3 Move the find_memory_block() routine up
Date: Mon, 19 Jul 2010 22:51:42 -0500	[thread overview]
Message-ID: <4C451D4E.8040600@austin.ibm.com> (raw)
In-Reply-To: <4C451BF5.50304@austin.ibm.com>

Move the find_me mory_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-07-16 12:41:30.000000000 -0500
+++ linux-2.6/drivers/base/memory.c	2010-07-19 20:42:11.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)
 {

  reply	other threads:[~2010-07-20  3:51 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-20  3:45 [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections Nathan Fontenot
2010-07-20  3:51 ` Nathan Fontenot [this message]
2010-07-20  6:55   ` [PATCH 1/8] v3 Move the find_memory_block() routine up KAMEZAWA Hiroyuki
2010-07-20  3:52 ` [PATCH 2/8] v3 Add new phys_index properties Nathan Fontenot
2010-07-20  6:57   ` KAMEZAWA Hiroyuki
2010-07-20 13:24   ` Nathan Fontenot
2010-07-20 19:10     ` Dave Hansen
2010-07-20  3:53 ` [PATCH 3/8] v3 Add section count to memory_block Nathan Fontenot
2010-07-20  7:01   ` KAMEZAWA Hiroyuki
2010-07-20 13:26   ` Nathan Fontenot
2010-07-20  3:55 ` [PATCH 4/8] v3 Allow memory_block to span multiple memory sections Nathan Fontenot
2010-07-20  7:15   ` KAMEZAWA Hiroyuki
2010-07-20 13:28   ` Nathan Fontenot
2010-07-20 19:18   ` Dave Hansen
2010-07-24  3:09     ` Nathan Fontenot
2010-07-27  2:36       ` Dave Hansen
2010-07-26 19:10     ` Nathan Fontenot
2010-07-20 19:21   ` Dave Hansen
2010-07-20  3:56 ` [PATCH 5/8] v3 Update the find_memory_block declaration Nathan Fontenot
2010-07-20  7:16   ` KAMEZAWA Hiroyuki
2010-07-20  3:57 ` [PATCH 6/8] v3 Update the node sysfs code Nathan Fontenot
2010-07-20  7:17   ` KAMEZAWA Hiroyuki
2010-07-28 13:50   ` Brian King
2010-07-20  3:59 ` [PATCH 7/8] v3 Define memory_block_size_bytes() for ppc/pseries Nathan Fontenot
2010-07-21 20:27   ` Brian King
2010-07-20  3:59 ` [PATCH 8/8] v3 Update memory-hotplug documentation Nathan Fontenot
2010-07-20 19:23   ` Dave Hansen
2010-07-31  5:36 ` [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections Benjamin Herrenschmidt
2010-07-31 19:55   ` Greg KH
2010-08-01  0:27     ` Benjamin Herrenschmidt

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=4C451D4E.8040600@austin.ibm.com \
    --to=nfont@austin.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).