Skip to content

Commit

Permalink
x86: {reverve,free}_memtype() take a physical address
Browse files Browse the repository at this point in the history
The new set_memory_array_{uc,wb}() pass virtual addresses to
{reserve,free}_memtype() it seems.

Signed-off-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Rene Herman authored and Ingo Molnar committed Aug 22, 2008
1 parent 8b53b57 commit 9a79f4f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/x86/mm/pageattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray)
* for now UC MINUS. see comments in ioremap_nocache()
*/
for (i = 0; i < addrinarray; i++) {
if (reserve_memtype(addr[i], addr[i] + PAGE_SIZE,
if (reserve_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE,
_PAGE_CACHE_UC_MINUS, NULL))
goto out;
}
Expand All @@ -956,7 +956,7 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray)
__pgprot(_PAGE_CACHE_UC_MINUS), 1);
out:
while (--i >= 0)
free_memtype(addr[i], addr[i] + PAGE_SIZE);
free_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE);
return -EINVAL;
}
EXPORT_SYMBOL(set_memory_array_uc);
Expand Down Expand Up @@ -998,7 +998,7 @@ int set_memory_array_wb(unsigned long *addr, int addrinarray)
{
int i;
for (i = 0; i < addrinarray; i++)
free_memtype(addr[i], addr[i] + PAGE_SIZE);
free_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE);

return change_page_attr_clear(addr, addrinarray,
__pgprot(_PAGE_CACHE_MASK), 1);
Expand Down

0 comments on commit 9a79f4f

Please sign in to comment.