diff --git a/[refs] b/[refs]
index b6df1faaba7c..1a61295b1859 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 308f7eeb7882c27c1d7aa783499cb22f3b199718
+refs/heads/master: 0a3d7ce7e6caa8c39cb5184bd9047a01a40abc2a
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index dfbd86cc4876..0ed4df0c6a39 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -4474,6 +4474,9 @@ static void tracing_init_debugfs_percpu(long cpu)
 	struct dentry *d_cpu;
 	char cpu_dir[30]; /* 30 characters should be more than enough */
 
+	if (!d_percpu)
+		return;
+
 	snprintf(cpu_dir, 30, "cpu%ld", cpu);
 	d_cpu = debugfs_create_dir(cpu_dir, d_percpu);
 	if (!d_cpu) {