From: Wen Congyang <we...@cn.fujitsu.com> The memory device has only one node id. Store the node id when enable the memory device, and we can reuse it when removing the memory device.
CC: David Rientjes <rient...@google.com> CC: Jiang Liu <liu...@gmail.com> CC: Len Brown <len.br...@intel.com> CC: Benjamin Herrenschmidt <b...@kernel.crashing.org> CC: Paul Mackerras <pau...@samba.org> CC: Christoph Lameter <c...@linux.com> Cc: Minchan Kim <minchan....@gmail.com> CC: Andrew Morton <a...@linux-foundation.org> CC: KOSAKI Motohiro <kosaki.motoh...@jp.fujitsu.com> CC: Yasuaki Ishimatsu <isimatu.yasu...@jp.fujitsu.com> Signed-off-by: Wen Congyang <we...@cn.fujitsu.com> Reviewed-by: Yasuaki Ishimatsu <isimatu.yasu...@jp.fujitsu.com> --- drivers/acpi/acpi_memhotplug.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 2a7beac..7873832 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -83,6 +83,7 @@ struct acpi_memory_info { struct acpi_memory_device { struct acpi_device * device; unsigned int state; /* State of the memory device */ + int nid; struct list_head res_list; }; @@ -256,6 +257,9 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) info->enabled = 1; num_enabled++; } + + mem_device->nid = node; + if (!num_enabled) { printk(KERN_ERR PREFIX "add_memory failed\n"); mem_device->state = MEMORY_INVALID_STATE; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/