diff options
Diffstat (limited to 'arch/ppc/kernel/dma-mapping.c')
| -rw-r--r-- | arch/ppc/kernel/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c index 685fd0defe23..61465ec88bc7 100644 --- a/arch/ppc/kernel/dma-mapping.c +++ b/arch/ppc/kernel/dma-mapping.c | |||
| @@ -223,6 +223,8 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) | |||
| 223 | pte_t *pte = consistent_pte + CONSISTENT_OFFSET(vaddr); | 223 | pte_t *pte = consistent_pte + CONSISTENT_OFFSET(vaddr); |
| 224 | struct page *end = page + (1 << order); | 224 | struct page *end = page + (1 << order); |
| 225 | 225 | ||
| 226 | split_page(page, order); | ||
| 227 | |||
| 226 | /* | 228 | /* |
| 227 | * Set the "dma handle" | 229 | * Set the "dma handle" |
| 228 | */ | 230 | */ |
| @@ -231,7 +233,6 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) | |||
| 231 | do { | 233 | do { |
| 232 | BUG_ON(!pte_none(*pte)); | 234 | BUG_ON(!pte_none(*pte)); |
| 233 | 235 | ||
| 234 | set_page_count(page, 1); | ||
| 235 | SetPageReserved(page); | 236 | SetPageReserved(page); |
| 236 | set_pte_at(&init_mm, vaddr, | 237 | set_pte_at(&init_mm, vaddr, |
| 237 | pte, mk_pte(page, pgprot_noncached(PAGE_KERNEL))); | 238 | pte, mk_pte(page, pgprot_noncached(PAGE_KERNEL))); |
| @@ -244,7 +245,6 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) | |||
| 244 | * Free the otherwise unused pages. | 245 | * Free the otherwise unused pages. |
| 245 | */ | 246 | */ |
| 246 | while (page < end) { | 247 | while (page < end) { |
| 247 | set_page_count(page, 1); | ||
| 248 | __free_page(page); | 248 | __free_page(page); |
| 249 | page++; | 249 | page++; |
| 250 | } | 250 | } |
