[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4D25EE4A.9010602@gmail.com>
Date: Thu, 06 Jan 2011 17:31:06 +0100
From: Jiri Slaby <jirislaby@...il.com>
To: "Rafael J. Wysocki" <rjw@...k.pl>
CC: Jiri Slaby <jslaby@...e.cz>, akpm@...ux-foundation.org,
linux-kernel@...r.kernel.org,
ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
Linux-pm mailing list <linux-pm@...ts.linux-foundation.org>,
Matthew Garrett <mjg59@...f.ucam.org>,
Len Brown <lenb@...nel.org>
Subject: Re: [PATCH 1/1] PM: fix oops in suspend/hibernate code
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists