Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98383031 authored by Robin Holt's avatar Robin Holt Committed by Greg Kroah-Hartman
Browse files

driver core: Introduce find_memory_block_hinted which utilizes kset_find_obj_hinted. 



Introduce a find_memory_block_hinted() which utilizes the
recently added kset_find_obj_hinted().

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
To: Dave Hansen <haveblue@us.ibm.com>
To: Matt Tolentino <matthew.e.tolentino@intel.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c25d1dfb

drivers/base/memory.c

+18 −10
Original line number Diff line number Diff line
@@ -468,28 +468,23 @@ static int add_memory_block(int nid, struct mem_section *section, 
	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 memory_block *find_memory_block_hinted(struct mem_section *section,

					      struct memory_block *hint)

{

	struct kobject *kobj;

	struct sys_device *sysdev;

	struct memory_block *mem;

	char name[sizeof(MEMORY_CLASS_NAME) + 9 + 1];



	kobj = hint ? &hint->sysdev.kobj : NULL;



	/*

	 * 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);

	kobj = kset_find_obj_hinted(&memory_sysdev_class.kset, name, kobj);

	if (!kobj)

		return NULL;
@@ -499,6 +494,19 @@ struct memory_block *find_memory_block(struct mem_section *section) 
	return mem;

}



/*

 * 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)

{

	return find_memory_block_hinted(section, NULL);

}



int remove_memory_block(unsigned long node_id, struct mem_section *section,

		int phys_device)

{

include/linux/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ extern int memory_dev_init(void); 
extern int remove_memory_block(unsigned long, struct mem_section *, int);

extern int memory_notify(unsigned long val, void *v);

extern int memory_isolate_notify(unsigned long val, void *v);

extern struct memory_block *find_memory_block_hinted(struct mem_section *,

							struct memory_block *);

extern struct memory_block *find_memory_block(struct mem_section *);

#define CONFIG_MEM_BLOCK_SIZE	(PAGES_PER_SECTION<<PAGE_SHIFT)

enum mem_add_context { BOOT, HOTPLUG };