diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig
index 4dcddf8..872ced2 100644
--- a/fs/gfs2/Kconfig
+++ b/fs/gfs2/Kconfig
@@ -38,3 +38,11 @@ config GFS2_FS_LOCKING_DLM
Most users of GFS2 will require this. It provides the locking
interface between GFS2 and the DLM, which is required to use GFS2
in a cluster environment.
+
+config GFS2_TRACER
+ bool "GFS2 tracing"
+ depends on GFS2_FS && EVENT_TRACING
+ help
+ Provide trace points in block allocation functions, locking, and
+ journaling code.
+
diff --git a/fs/gfs2/trace_gfs2.h b/fs/gfs2/trace_gfs2.h
index 148d55c..5f4faf3 100644
--- a/fs/gfs2/trace_gfs2.h
+++ b/fs/gfs2/trace_gfs2.h
@@ -1,5 +1,7 @@
#undef TRACE_SYSTEM
+#undef TRACE_CONFIG
#define TRACE_SYSTEM gfs2
+#define TRACE_CONFIG CONFIG_GFS2_TRACER