Re: [PATCH 1/1] PM: fix oops in suspend/hibernate code

[Jiri Slaby <jirislaby@gmail.com>]

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