Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933705Ab3CHGtH (ORCPT ); Fri, 8 Mar 2013 01:49:07 -0500 Received: from mail-oa0-f52.google.com ([209.85.219.52]:34053 "EHLO mail-oa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753117Ab3CHGtG (ORCPT ); Fri, 8 Mar 2013 01:49:06 -0500 MIME-Version: 1.0 In-Reply-To: <20130308053653.GE14556@mtj.dyndns.org> References: <1362718720-27048-1-git-send-email-yinghai@kernel.org> <1362718720-27048-4-git-send-email-yinghai@kernel.org> <20130308053653.GE14556@mtj.dyndns.org> Date: Thu, 7 Mar 2013 22:49:04 -0800 X-Google-Sender-Auth: xB1xwvF3OkYG_O8CsqetU0CsdyI Message-ID: Subject: Re: [PATCH 03/14] x86, ACPI: store override acpi tables phys addr From: Yinghai Lu To: Tejun Heo Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Andrew Morton , Thomas Renninger , Tang Chen , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , linux-acpi@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1595 Lines: 38 On Thu, Mar 7, 2013 at 9:36 PM, Tejun Heo 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 >> Cc: Thomas Renninger >> Cc: Rafael J. Wysocki >> Cc: linux-acpi@vger.kernel.org >> --- >> @@ -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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/