2012/11/15 15:59, Wen Congyang wrote:
> 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.
>
> CC: David Rientjes <rientjes@xxxxxxxxxx>
> CC: Jiang Liu <liuj97@xxxxxxxxx>
> CC: Len Brown <len.brown@xxxxxxxxx>
> CC: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> CC: Paul Mackerras <paulus@xxxxxxxxx>
> CC: Christoph Lameter <cl@xxxxxxxxx>
> Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> CC: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
> CC: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
> CC: Rafael J. Wysocki <rjw@xxxxxxx>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx>
> ---
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
Thanks,
Yasuaki Ishimatsu
> drivers/acpi/acpi_memhotplug.c | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index f7e3007..e0f7425 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -87,8 +87,6 @@ struct acpi_memory_device {
> struct list_head res_list;
> };
>
> -static int acpi_hotmem_initialized;
> -
> static acpi_status
> acpi_memory_get_resource(struct acpi_resource *resource, void *context)
> {
> @@ -433,15 +431,6 @@ static int acpi_memory_device_add(struct acpi_device *device)
>
> printk(KERN_DEBUG "%s \n", acpi_device_name(device));
>
> - /*
> - * Early boot code has recognized memory area by EFI/E820.
> - * If DSDT shows these memory devices on boot, hotplug is not necessary
> - * for them. So, it just returns until completion of this driver's
> - * start up.
> - */
> - if (!acpi_hotmem_initialized)
> - return 0;
> -
> if (!acpi_memory_check_device(mem_device)) {
> /* call add_memory func */
> result = acpi_memory_enable_device(mem_device);
> @@ -557,7 +546,6 @@ static int __init acpi_memory_device_init(void)
> return -ENODEV;
> }
>
> - acpi_hotmem_initialized = 1;
> return 0;
> }
>
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>