diff options
| -rw-r--r-- | arch/x86/mm/pageattr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 1785591808bd..fed6ba2a8e7e 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -947,7 +947,7 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray) | |||
| 947 | * for now UC MINUS. see comments in ioremap_nocache() | 947 | * for now UC MINUS. see comments in ioremap_nocache() |
| 948 | */ | 948 | */ |
| 949 | for (i = 0; i < addrinarray; i++) { | 949 | for (i = 0; i < addrinarray; i++) { |
| 950 | if (reserve_memtype(addr[i], addr[i] + PAGE_SIZE, | 950 | if (reserve_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE, |
| 951 | _PAGE_CACHE_UC_MINUS, NULL)) | 951 | _PAGE_CACHE_UC_MINUS, NULL)) |
| 952 | goto out; | 952 | goto out; |
| 953 | } | 953 | } |
| @@ -956,7 +956,7 @@ int set_memory_array_uc(unsigned long *addr, int addrinarray) | |||
| 956 | __pgprot(_PAGE_CACHE_UC_MINUS), 1); | 956 | __pgprot(_PAGE_CACHE_UC_MINUS), 1); |
| 957 | out: | 957 | out: |
| 958 | while (--i >= 0) | 958 | while (--i >= 0) |
| 959 | free_memtype(addr[i], addr[i] + PAGE_SIZE); | 959 | free_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE); |
| 960 | return -EINVAL; | 960 | return -EINVAL; |
| 961 | } | 961 | } |
| 962 | EXPORT_SYMBOL(set_memory_array_uc); | 962 | EXPORT_SYMBOL(set_memory_array_uc); |
| @@ -998,7 +998,7 @@ int set_memory_array_wb(unsigned long *addr, int addrinarray) | |||
| 998 | { | 998 | { |
| 999 | int i; | 999 | int i; |
| 1000 | for (i = 0; i < addrinarray; i++) | 1000 | for (i = 0; i < addrinarray; i++) |
| 1001 | free_memtype(addr[i], addr[i] + PAGE_SIZE); | 1001 | free_memtype(__pa(addr[i]), __pa(addr[i]) + PAGE_SIZE); |
| 1002 | 1002 | ||
| 1003 | return change_page_attr_clear(addr, addrinarray, | 1003 | return change_page_attr_clear(addr, addrinarray, |
| 1004 | __pgprot(_PAGE_CACHE_MASK), 1); | 1004 | __pgprot(_PAGE_CACHE_MASK), 1); |
