From 51ba01310a24c9432a88660f7976781762cec20f Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 22 Mar 2009 23:10:45 +0100
Subject: [PATCH] --- yaml --- r: 141028 b: refs/heads/master c:
 3e1f60b80cafcb5d7e8d3665b35962fbb8fb9efa h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39b4f131fcc2..7829394b3bef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0f92ba99bdeaf35f9c580291b4e1a657c67fbd4
+refs/heads/master: 3e1f60b80cafcb5d7e8d3665b35962fbb8fb9efa
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index ace685c70186..f0e1337b1ebd 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -3513,6 +3513,9 @@ struct dentry *tracing_init_dentry(void)
 	if (d_tracer)
 		return d_tracer;
 
+	if (!debugfs_initialized())
+		return NULL;
+
 	d_tracer = debugfs_create_dir("tracing", NULL);
 
 	if (!d_tracer && !once) {