diff options
author | 2019-05-06 10:33:10 +0200 | |
---|---|---|
committer | 2019-05-06 10:33:10 +0200 | |
commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /mm/memory.c | |
parent | Merge branch 'for-5.2-vsprintf-hardening' into for-linus (diff) | |
parent | treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively (diff) | |
download | wireguard-linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.xz wireguard-linux-0f46c78391e1348fe45af86a0cd52795726695af.zip |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 47fe250307c7..3541a15067f2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -519,7 +519,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, dump_page(page, "bad pte"); pr_alert("addr:%p vm_flags:%08lx anon_vma:%p mapping:%p index:%lx\n", (void *)addr, vma->vm_flags, vma->anon_vma, mapping, index); - pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n", + pr_alert("file:%pD fault:%ps mmap:%ps readpage:%ps\n", vma->vm_file, vma->vm_ops ? vma->vm_ops->fault : NULL, vma->vm_file ? vma->vm_file->f_op->mmap : NULL, |