| Message ID | 1352962777-24407-7-git-send-email-wency@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
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@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> > CC: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> > CC: Rafael J. Wysocki <rjw@sisk.pl> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> > --- Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> 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 from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 15 Nov 2012, 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@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> > CC: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> > CC: Rafael J. Wysocki <rjw@sisk.pl> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Acked-by: David Rientjes <rientjes@google.com> -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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@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> CC: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> CC: Rafael J. Wysocki <rjw@sisk.pl> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> --- drivers/acpi/acpi_memhotplug.c | 12 ------------ 1 file changed, 12 deletions(-)