diff --git a/[refs] b/[refs] index 8f7e5e2112dc..d85121ace7e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92205c2343527a863d660360599a4bf8cede77b0 +refs/heads/master: 9d0a420b737f72d84fabebf29634d800cbf54538 diff --git a/trunk/lib/Makefile b/trunk/lib/Makefile index 6ca9e6ee1e33..d97ad1100b6f 100644 --- a/trunk/lib/Makefile +++ b/trunk/lib/Makefile @@ -10,8 +10,9 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ ifdef CONFIG_FTRACE # Do not profile string.o, since it may be used in early boot or vdso +# Also do not profile any debug utilities ORIG_CFLAGS := $(KBUILD_CFLAGS) -KBUILD_CFLAGS = $(if $(subst string,,$(basename $(notdir $@))), \ +KBUILD_CFLAGS = $(if $(filter-out %debug debug% string%,$(basename $(notdir $@))), \ $(ORIG_CFLAGS), \ $(subst -pg,,$(ORIG_CFLAGS))) endif