diff options
author | Wen Congyang <wency@cn.fujitsu.com> | 2012-11-15 20:12:38 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 20:12:38 -0500 |
commit | 61d8eff14417fb6d6c5d57e4f0f7925e9e99fce3 (patch) | |
tree | a920e7934dc08f036bdffb78b77c7030c410a2a6 /drivers/acpi | |
parent | 65479472571fbf91502b7854be45ec0026b5229e (diff) |
ACPI / memhotplug: bind the memory device when the driver is being loaded
We had introduced acpi_hotmem_initialized to avoid strange add_memory fail
message. But the memory device may not be used by the kernel, and the
device should be bound when the driver is being loaded. Remove
acpi_hotmem_initialized to allow that the device can be bound when the
driver is being loaded.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index f7e30076996..e0f7425c885 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
@@ -87,8 +87,6 @@ struct acpi_memory_device { | |||
87 | struct list_head res_list; | 87 | struct list_head res_list; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | static int acpi_hotmem_initialized; | ||
91 | |||
92 | static acpi_status | 90 | static acpi_status |
93 | acpi_memory_get_resource(struct acpi_resource *resource, void *context) | 91 | acpi_memory_get_resource(struct acpi_resource *resource, void *context) |
94 | { | 92 | { |
@@ -433,15 +431,6 @@ static int acpi_memory_device_add(struct acpi_device *device) | |||
433 | 431 | ||
434 | printk(KERN_DEBUG "%s \n", acpi_device_name(device)); | 432 | printk(KERN_DEBUG "%s \n", acpi_device_name(device)); |
435 | 433 | ||
436 | /* | ||
437 | * Early boot code has recognized memory area by EFI/E820. | ||
438 | * If DSDT shows these memory devices on boot, hotplug is not necessary | ||
439 | * for them. So, it just returns until completion of this driver's | ||
440 | * start up. | ||
441 | */ | ||
442 | if (!acpi_hotmem_initialized) | ||
443 | return 0; | ||
444 | |||
445 | if (!acpi_memory_check_device(mem_device)) { | 434 | if (!acpi_memory_check_device(mem_device)) { |
446 | /* call add_memory func */ | 435 | /* call add_memory func */ |
447 | result = acpi_memory_enable_device(mem_device); | 436 | result = acpi_memory_enable_device(mem_device); |
@@ -557,7 +546,6 @@ static int __init acpi_memory_device_init(void) | |||
557 | return -ENODEV; | 546 | return -ENODEV; |
558 | } | 547 | } |
559 | 548 | ||
560 | acpi_hotmem_initialized = 1; | ||
561 | return 0; | 549 | return 0; |
562 | } | 550 | } |
563 | 551 | ||