From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: Re: [PATCH 1/1] PM: fix oops in suspend/hibernate code Date: Thu, 06 Jan 2011 17:31:06 +0100 Message-ID: <4D25EE4A.9010602@gmail.com> References: <201101060028.43342.rjw@sisk.pl> <1294305504-5787-1-git-send-email-jslaby@suse.cz> <201101061657.39723.rjw@sisk.pl> <4D25E943.804@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-bw0-f66.google.com ([209.85.214.66]:36297 "EHLO mail-bw0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751538Ab1AFQbL (ORCPT ); Thu, 6 Jan 2011 11:31:11 -0500 In-Reply-To: <4D25E943.804@gmail.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: "Rafael J. Wysocki" Cc: Jiri Slaby , akpm@linux-foundation.org, linux-kernel@vger.kernel.org, ACPI Devel Maling List , Linux-pm mailing list , Matthew Garrett , Len Brown On 01/06/2011 05:09 PM, Jiri Slaby wrote: >>> --- a/kernel/power/nvs.c >>> +++ b/kernel/power/nvs.c >>> @@ -105,7 +105,7 @@ int suspend_nvs_alloc(void) >>> /** >>> * suspend_nvs_save - save NVS memory regions >>> */ >>> -void suspend_nvs_save(void) >>> +int suspend_nvs_save(void) >>> { >>> struct nvs_page *entry; >>> >>> @@ -114,8 +114,14 @@ void suspend_nvs_save(void) >>> list_for_each_entry(entry, &nvs_list, node) >>> if (entry->data) { >>> entry->kaddr = ioremap(entry->phys_start, entry->size); >> >> I wonder what happens if you simply change the ioremap() here to >> ioremap_nocache() without any other modifications? > > ioremap *is* ioremap_nocache on x86. And that's the conflict it > complains about I guess? Don't you mean ioremap_cache? Using ioremap_cache indeed fixes the problem... thanks, -- js