diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-18 17:50:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-18 17:50:32 +1100 |
| commit | 521ffb22b5e3eefc5f4a44d540acf746d6233cde (patch) | |
| tree | 49d1315305821316e769260a3db93485540d89ac /arch/openrisc/mm/ioremap.c | |
| parent | f5f8a43b28ac49c9182d5ed86724550bbaeff3e9 (diff) | |
| parent | c435ec1e25d37f0778ee0077e4ed1181f38e9d5d (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/openrisc/mm/ioremap.c')
| -rw-r--r-- | arch/openrisc/mm/ioremap.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c index 270d1c9bc0d6..051bcb4fefd3 100644 --- a/arch/openrisc/mm/ioremap.c +++ b/arch/openrisc/mm/ioremap.c @@ -122,13 +122,10 @@ pte_t __ref *pte_alloc_one_kernel(struct mm_struct *mm) { pte_t *pte; - if (likely(mem_init_done)) { - pte = (pte_t *) __get_free_page(GFP_KERNEL); - } else { - pte = (pte_t *) __va(memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE)); - } + if (likely(mem_init_done)) + pte = (pte_t *)get_zeroed_page(GFP_KERNEL); + else + pte = memblock_alloc(PAGE_SIZE, PAGE_SIZE); - if (pte) - clear_page(pte); return pte; } |