---

yaml --- r: 100473 b: refs/heads/master c: 3594136 h: refs/heads/master i: 100471: 30caf23 v: v3
git-mirror · May 23, 2008 · 42ba37c · 42ba37c
1 parent 80162f8
commit 42ba37c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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