Messages in this thread Patch in this message |  | | | Date | Tue, 3 Jul 2012 14:59:34 +0900 | | From | Yasuaki Ishimatsu <> | | Subject | [RFC PATCH v2 6/13] memory-hotplug : add memory_block_release |
| |
When calling remove_memory_block(), the function shows following message at device_release().
Device 'memory528' does not have a release() function, it is broken and must be fixed.
remove_memory_block() calls kfree(mem). I think it shouled be called from device_release(). So the patch implements memory_block_release()
CC: David Rientjes <rientjes@google.com> CC: Jiang Liu <liuj97@gmail.com> CC: Len Brown <len.brown@intel.com> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Paul Mackerras <paulus@samba.org> CC: Christoph Lameter <cl@linux.com> Cc: Minchan Kim <minchan.kim@gmail.com> CC: Andrew Morton <akpm@linux-foundation.org> CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
--- drivers/base/memory.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: linux-3.5-rc4/drivers/base/memory.c =================================================================== --- linux-3.5-rc4.orig/drivers/base/memory.c 2012-07-03 14:21:58.335263984 +0900 +++ linux-3.5-rc4/drivers/base/memory.c 2012-07-03 14:22:08.094141981 +0900 @@ -108,6 +108,15 @@ bool is_memblk_offline(unsigned long sta } EXPORT_SYMBOL(is_memblk_offline);
+#define to_memory_block(device) container_of(device, struct memory_block, dev) + +static void release_memory_block(struct device *dev) +{ + struct memory_block *mem = to_memory_block(dev); + + kfree(mem); +} + /* * register_memory - Setup a sysfs device for a memory block */ @@ -118,6 +127,7 @@ int register_memory(struct memory_block
memory->dev.bus = &memory_subsys; memory->dev.id = memory->start_section_nr / sections_per_block; + memory->dev.release = release_memory_block;
error = device_register(&memory->dev); return error; @@ -668,7 +678,6 @@ int remove_memory_block(unsigned long no mem_remove_simple_file(mem, phys_device); mem_remove_simple_file(mem, removable); unregister_memory(mem); - kfree(mem); } else kobject_put(&mem->dev.kobj);
|  |