diff options
author | Petr Mladek <pmladek@suse.com> | 2019-05-06 11:33:10 +0300 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2019-05-06 11:33:10 +0300 |
commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /arch/microblaze | |
parent | 35e1547511fcb035437b4527184458adfb0e8f43 (diff) | |
parent | d75f773c86a2b8b7278e2c33343b46a4024bc002 (diff) | |
download | linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.xz |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/mm/pgtable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c index c2ce1e42b888..8fe54fda31dc 100644 --- a/arch/microblaze/mm/pgtable.c +++ b/arch/microblaze/mm/pgtable.c @@ -75,7 +75,7 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size, p >= memory_start && p < virt_to_phys(high_memory) && !(p >= __virt_to_phys((phys_addr_t)__bss_stop) && p < __virt_to_phys((phys_addr_t)__bss_stop))) { - pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n", + pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %ps\n", (unsigned long)p, __builtin_return_address(0)); return NULL; } |