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

Commit fd4655c2 authored by Yasuaki Ishimatsu's avatar Yasuaki Ishimatsu Committed by Rafael J. Wysocki
Browse files

ACPI / memhotplug: Remove info->failed bit 



acpi_memory_info has enabled bit and failed bit for controlling memory
hotplug. But we don't need to keep both bits.

The patch removes acpi_memory_info->failed bit.

Signed-off-by: default avataryasuaki ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bb49d82d

drivers/acpi/acpi_memhotplug.c

+2 −13
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct acpi_memory_info { 
	unsigned short caching;	/* memory cache attribute */

	unsigned short write_protect;	/* memory read/write attribute */

	unsigned int enabled:1;

	unsigned int failed:1;

};



struct acpi_memory_device {
@@ -201,10 +200,8 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) 
		 * returns -EEXIST. If add_memory() returns the other error, it

		 * means that this memory block is not used by the kernel.

		 */

		if (result && result != -EEXIST) {

			info->failed = 1;

		if (result && result != -EEXIST)

			continue;

		}



		info->enabled = 1;
@@ -238,16 +235,8 @@ static int acpi_memory_remove_memory(struct acpi_memory_device *mem_device) 
	nid = acpi_get_node(mem_device->device->handle);



	list_for_each_entry_safe(info, n, &mem_device->res_list, list) {

		if (info->failed)

			/* The kernel does not use this memory block */

			continue;



		if (!info->enabled)

			/*

			 * The kernel uses this memory block, but it may be not

			 * managed by us.

			 */

			return -EBUSY;

			continue;



		if (nid < 0)

			nid = memory_add_physaddr_to_nid(info->start_addr);