From 42ba37c3c9d71d04e086f9f6b7ab09ae9af35848 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 12 May 2008 21:20:50 +0200
Subject: [PATCH] --- yaml --- r: 100473 b: refs/heads/master c:
 3594136ad67a54d77bcb2547e70011754a2f91d5 h: refs/heads/master i:   100471:
 30caf23ce258e3709b6a22c2cb34984695023930 v: v3

---
 [refs]             | 2 +-
 trunk/lib/Makefile | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c593836bc559..daac2eff5c23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf8cdebfb6c1cff50ea8077f1a07c2333d6d1fd
+refs/heads/master: 3594136ad67a54d77bcb2547e70011754a2f91d5
diff --git a/trunk/lib/Makefile b/trunk/lib/Makefile
index 74b0cfb1fcc3..6ca9e6ee1e33 100644
--- a/trunk/lib/Makefile
+++ b/trunk/lib/Makefile
@@ -8,6 +8,14 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
 	 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
 	 proportions.o prio_heap.o ratelimit.o
 
+ifdef CONFIG_FTRACE
+# Do not profile string.o, since it may be used in early boot or vdso
+ORIG_CFLAGS := $(KBUILD_CFLAGS)
+KBUILD_CFLAGS = $(if $(subst string,,$(basename $(notdir $@))), \
+	$(ORIG_CFLAGS), \
+	$(subst -pg,,$(ORIG_CFLAGS)))
+endif
+
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o