diff options
Diffstat (limited to 'arch/ppc64/mm')
-rw-r--r-- | arch/ppc64/mm/init.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index 9edfe267123e..a16cf12c586b 100644 --- a/arch/ppc64/mm/init.c +++ b/arch/ppc64/mm/init.c | |||
@@ -42,7 +42,6 @@ | |||
42 | 42 | ||
43 | #include <asm/pgalloc.h> | 43 | #include <asm/pgalloc.h> |
44 | #include <asm/page.h> | 44 | #include <asm/page.h> |
45 | #include <asm/abs_addr.h> | ||
46 | #include <asm/prom.h> | 45 | #include <asm/prom.h> |
47 | #include <asm/lmb.h> | 46 | #include <asm/lmb.h> |
48 | #include <asm/rtas.h> | 47 | #include <asm/rtas.h> |
@@ -167,7 +166,6 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags) | |||
167 | ptep = pte_alloc_kernel(&init_mm, pmdp, ea); | 166 | ptep = pte_alloc_kernel(&init_mm, pmdp, ea); |
168 | if (!ptep) | 167 | if (!ptep) |
169 | return -ENOMEM; | 168 | return -ENOMEM; |
170 | pa = abs_to_phys(pa); | ||
171 | set_pte_at(&init_mm, ea, ptep, pfn_pte(pa >> PAGE_SHIFT, | 169 | set_pte_at(&init_mm, ea, ptep, pfn_pte(pa >> PAGE_SHIFT, |
172 | __pgprot(flags))); | 170 | __pgprot(flags))); |
173 | spin_unlock(&init_mm.page_table_lock); | 171 | spin_unlock(&init_mm.page_table_lock); |
@@ -547,7 +545,7 @@ void __init do_init_bootmem(void) | |||
547 | */ | 545 | */ |
548 | bootmap_pages = bootmem_bootmap_pages(total_pages); | 546 | bootmap_pages = bootmem_bootmap_pages(total_pages); |
549 | 547 | ||
550 | start = abs_to_phys(lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE)); | 548 | start = lmb_alloc(bootmap_pages<<PAGE_SHIFT, PAGE_SIZE); |
551 | BUG_ON(!start); | 549 | BUG_ON(!start); |
552 | 550 | ||
553 | boot_mapsize = init_bootmem(start >> PAGE_SHIFT, total_pages); | 551 | boot_mapsize = init_bootmem(start >> PAGE_SHIFT, total_pages); |