On Thu, Mar 7, 2013 at 9:36 PM, Tejun Heo <tj@xxxxxxxxxx> wrote: > On Thu, Mar 07, 2013 at 08:58:29PM -0800, Yinghai Lu wrote: >> As later 32bit only find table with phys address during 32bit flat mode >> in head_32.S. >> >> To keep 32bit and 64 bit consistent, use phys_addr for all. >> >> Use early_ioremap to access during copying. >> >> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> >> Cc: Thomas Renninger <trenn@xxxxxxx> >> Cc: Rafael J. Wysocki <rjw@xxxxxxx> >> Cc: linux-acpi@xxxxxxxxxxxxxxx >> --- >> @@ -654,10 +654,13 @@ void __init acpi_initrd_override_copy(void) >> arch_reserve_mem_area(acpi_tables_addr, all_tables_size); >> >> for (no = 0; no < table_nr; no++) { >> - size_t size = early_initrd_files[no].size; >> + unsigned long size = early_initrd_files[no].size; >> >> p = early_ioremap(acpi_tables_addr + total_offset, size); >> - memcpy(p, early_initrd_files[no].data, size); >> + q = early_ioremap((unsigned long)early_initrd_files[no].data, >> + size); >> + memcpy(p, q, size); >> + early_iounmap(q, size); > > Ah, okay, so the loop change in the previous patch was for this, I > suppose? That chunk probably should either be a separate patch or > rolled into this one. merge two patches? -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html