diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 10:44:55 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 10:44:55 -0400 |
| commit | 73e8fb2d596d5903cde6dcced39c0b88b5770a56 (patch) | |
| tree | 27c63346b888ce8f086a81ad801755bc1d4aa2d8 /arch/parisc | |
| parent | 33e09f0ee76e9e4108c5aed67e027ef5e3fe0634 (diff) | |
| parent | 3baf32898e1c88792fa7cadc88f601833bdae3da (diff) | |
| download | linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.tar.gz linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.tar.bz2 linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.zip | |
Merge branch 'work.const-qstr' into work.misc
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 67001277256c..629eb464d5ba 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -345,7 +345,7 @@ void flush_dcache_page(struct page *page) != (addr & (SHM_COLOUR - 1))) { __flush_cache_page(mpnt, addr, page_to_phys(page)); if (old_addr) - printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name : "(null)"); + printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %pD\n", old_addr, addr, mpnt->vm_file); old_addr = addr; } } |