Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further
modifications.

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 91eecaaa43e0..05330494a0df 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6079,7 +6079,7 @@ trace_create_cpu_file(const char *name, umode_t mode, struct dentry *parent,
         struct dentry *ret = trace_create_file(name, mode, parent, data, fops);
 
         if (ret) /* See tracing_get_cpu() */
-                ret->d_inode->i_cdev = (void *)(cpu + 1);
+                d_inode(ret)->i_cdev = (void *)(cpu + 1);
         return ret;
 }