diff options
Diffstat (limited to 'arch/powerpc/mm/pgtable_32.c')
-rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index a87ead0138b4..8dc41c0157fe 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -78,7 +78,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) | |||
78 | 78 | ||
79 | /* pgdir take page or two with 4K pages and a page fraction otherwise */ | 79 | /* pgdir take page or two with 4K pages and a page fraction otherwise */ |
80 | #ifndef CONFIG_PPC_4K_PAGES | 80 | #ifndef CONFIG_PPC_4K_PAGES |
81 | ret = (pgd_t *)kzalloc(1 << PGDIR_ORDER, GFP_KERNEL); | 81 | ret = kzalloc(1 << PGDIR_ORDER, GFP_KERNEL); |
82 | #else | 82 | #else |
83 | ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, | 83 | ret = (pgd_t *)__get_free_pages(GFP_KERNEL|__GFP_ZERO, |
84 | PGDIR_ORDER - PAGE_SHIFT); | 84 | PGDIR_ORDER - PAGE_SHIFT); |
@@ -230,6 +230,7 @@ __ioremap_caller(phys_addr_t addr, unsigned long size, unsigned long flags, | |||
230 | area = get_vm_area_caller(size, VM_IOREMAP, caller); | 230 | area = get_vm_area_caller(size, VM_IOREMAP, caller); |
231 | if (area == 0) | 231 | if (area == 0) |
232 | return NULL; | 232 | return NULL; |
233 | area->phys_addr = p; | ||
233 | v = (unsigned long) area->addr; | 234 | v = (unsigned long) area->addr; |
234 | } else { | 235 | } else { |
235 | v = (ioremap_bot -= size); | 236 | v = (ioremap_bot -= size); |