projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index 11b9ca1767408dddb147c4b225de0aa31b8f17e7..a84fbb772034f2e73eac300e254bd54f2a36ce03 100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-3726,7
+3726,7
@@
void print_vma_addr(char *prefix, unsigned long ip)
if (buf) {
char *p;
- p =
d_path(&f->f_path
, buf, PAGE_SIZE);
+ p =
file_path(f
, buf, PAGE_SIZE);
if (IS_ERR(p))
p = "?";
printk("%s%s[%lx+%lx]", prefix, kbasename(p),