diff --git a/[refs] b/[refs] index b0b99bf9ad48..770e4f1e2730 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ccd15497869f3ed83b5225d410df53a96e52757 +refs/heads/master: d3d21c412d8525eb2e208d990ab5eee5fb0fe03d diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 7efb7ebaaae0..7f9521c3c01b 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -2116,7 +2116,7 @@ static void perf_counter_mmap_event(struct perf_mmap_event *mmap_event) name = strncpy(tmp, "//enomem", sizeof(tmp)); goto got_name; } - name = dentry_path(file->f_dentry, buf, PATH_MAX); + name = d_path(&file->f_path, buf, PATH_MAX); if (IS_ERR(name)) { name = strncpy(tmp, "//toolong", sizeof(tmp)); goto got_name;