diff --git a/[refs] b/[refs]
index daac2eff5c23..01933edff950 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3594136ad67a54d77bcb2547e70011754a2f91d5
+refs/heads/master: b53dde9d34f2df396540988ebc65c33400f57b04
diff --git a/trunk/kernel/trace/Makefile b/trunk/kernel/trace/Makefile
index 3fec653d6533..c25a6cd6a529 100644
--- a/trunk/kernel/trace/Makefile
+++ b/trunk/kernel/trace/Makefile
@@ -1,3 +1,11 @@
+
+# Do not instrument the tracer itself:
+
+ifdef CONFIG_FTRACE
+ORIG_CFLAGS := $(KBUILD_CFLAGS)
+KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+endif
+
 obj-$(CONFIG_FTRACE) += libftrace.o
 
 obj-$(CONFIG_TRACING) += trace.o