diff options
Diffstat (limited to 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index fbdad0e3929a..0dba5066c22a 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -62,7 +62,7 @@ | |||
62 | 62 | ||
63 | int init_bootmem_done; | 63 | int init_bootmem_done; |
64 | int mem_init_done; | 64 | int mem_init_done; |
65 | phys_addr_t memory_limit; | 65 | unsigned long long memory_limit; |
66 | 66 | ||
67 | #ifdef CONFIG_HIGHMEM | 67 | #ifdef CONFIG_HIGHMEM |
68 | pte_t *kmap_pte; | 68 | pte_t *kmap_pte; |
@@ -300,8 +300,7 @@ void __init mem_init(void) | |||
300 | unsigned long reservedpages = 0, codesize, initsize, datasize, bsssize; | 300 | unsigned long reservedpages = 0, codesize, initsize, datasize, bsssize; |
301 | 301 | ||
302 | #ifdef CONFIG_SWIOTLB | 302 | #ifdef CONFIG_SWIOTLB |
303 | if (ppc_swiotlb_enable) | 303 | swiotlb_init(0); |
304 | swiotlb_init(1); | ||
305 | #endif | 304 | #endif |
306 | 305 | ||
307 | num_physpages = memblock_phys_mem_size() >> PAGE_SHIFT; | 306 | num_physpages = memblock_phys_mem_size() >> PAGE_SHIFT; |