Merge branch 'work.openat2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 2173c23..dc9c643 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7495,7 +7495,7 @@ static void perf_fill_ns_link_info(struct perf_ns_link_info *ns_link_info,
 {
        struct path ns_path;
        struct inode *ns_inode;
-       void *error;
+       int error;
 
        error = ns_get_path(&ns_path, task, ns_ops);
        if (!error) {