From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756251Ab2INDDe (ORCPT ); Thu, 13 Sep 2012 23:03:34 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:5263 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754763Ab2INDCf (ORCPT ); Thu, 13 Sep 2012 23:02:35 -0400 X-Authority-Analysis: v=2.0 cv=Hsb06jvS c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=Ciwy3NGCPMMA:10 a=89AsJ-lq6EUA:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=meVymXHHAAAA:8 a=bzpiRyU9tCgA:10 a=UPm3pfgAAAAA:8 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=Z4Rwk6OoAAAA:8 a=PtDNVHqPAAAA:8 a=drOt6m5kAAAA:8 a=uMbGErvHagTwsCRPU3sA:9 a=QEXdDO2ut3YA:10 a=mOio7EKfaG4A:10 a=MSl-tDqOz04A:10 a=jEp0ucaQiEUA:10 a=jbrJJM5MRmoA:10 a=wYE_KDyynt4A:10 a=jeBq3FmKZ4MA:10 a=aN3pYExnV59675I8ZFwA:9 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.115.198 Message-Id: <20120914030232.310525590@goodmis.org> User-Agent: quilt/0.60-1 Date: Thu, 13 Sep 2012 23:00:14 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Frederic Weisbecker , Ingo Molnar , Peter Zijlstra , "Eric W. Biederman" , Al Viro , Josh Triplett Subject: [PATCH 2/6 v2] trace: Stop compiling in trace_clock unconditionally References: <20120914030012.315074731@goodmis.org> Content-Disposition: inline; filename=0002-trace-Stop-compiling-in-trace_clock-unconditionally.patch Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="00GvhwF7k39YY" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --00GvhwF7k39YY Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable From: Josh Triplett Commit 56449f437 "tracing: make the trace clocks available generally", in April 2009, made trace_clock available unconditionally, since CONFIG_X86_DS used it too. Commit faa4602e47 "x86, perf, bts, mm: Delete the never used BTS-ptrace cod= e", in March 2010, removed CONFIG_X86_DS, and now only CONFIG_RING_BUFFER (split out from CONFIG_TRACING for general use) has a dependency on trace_clock. S= o, only compile in trace_clock with CONFIG_RING_BUFFER or CONFIG_TRACING enabled. Link: http://lkml.kernel.org/r/20120903024513.GA19583@leaf Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Andrew Morton Cc: "Eric W. Biederman" Cc: Al Viro Signed-off-by: Josh Triplett Signed-off-by: Steven Rostedt --- kernel/Makefile | 2 +- kernel/trace/Kconfig | 5 +++++ kernel/trace/Makefile | 6 +----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index c0cc67a..29d993b 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -98,7 +98,7 @@ obj-$(CONFIG_COMPAT_BINFMT_ELF) +=3D elfcore.o obj-$(CONFIG_BINFMT_ELF_FDPIC) +=3D elfcore.o obj-$(CONFIG_FUNCTION_TRACER) +=3D trace/ obj-$(CONFIG_TRACING) +=3D trace/ -obj-$(CONFIG_X86_DS) +=3D trace/ +obj-$(CONFIG_TRACE_CLOCK) +=3D trace/ obj-$(CONFIG_RING_BUFFER) +=3D trace/ obj-$(CONFIG_TRACEPOINTS) +=3D trace/ obj-$(CONFIG_IRQ_WORK) +=3D irq_work.o diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 9301a0e..4cea4f4 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -62,8 +62,12 @@ config HAVE_C_RECORDMCOUNT config TRACER_MAX_TRACE bool =20 +config TRACE_CLOCK + bool + config RING_BUFFER bool + select TRACE_CLOCK =20 config FTRACE_NMI_ENTER bool @@ -114,6 +118,7 @@ config TRACING select NOP_TRACER select BINARY_PRINTF select EVENT_TRACING + select TRACE_CLOCK =20 config GENERIC_TRACER bool diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 8370908..d7e2068 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -19,11 +19,7 @@ endif =20 CFLAGS_trace_events_filter.o :=3D -I$(src) =20 -# -# Make the trace clocks available generally: it's infrastructure -# relied on by ptrace for example: -# -obj-y +=3D trace_clock.o +obj-$(CONFIG_TRACE_CLOCK) +=3D trace_clock.o =20 obj-$(CONFIG_FUNCTION_TRACER) +=3D libftrace.o obj-$(CONFIG_RING_BUFFER) +=3D ring_buffer.o --=20 1.7.10.4 --00GvhwF7k39YY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJQUp5IAAoJEOdOSU1xswtMMs8H/02OYhNf91klTyt4UAFtF98Z xn0hnAfbrvi+5eIsoLKLLRgesuG4lmB0DLDdGNmPr5taGrHS91Rcl05xJWlIuTag wrVkeWGzgXwrhh5E1VDNhqNThxiPLCX1hklboeQGvBZNKwMronfdre2LwZBrk/s/ hrlzCEI9CVcP0w1/jYRGqqu0oIY6dUz6M91tf2PEmlvCATMwoykcbjPA/7hGVUBQ fGimcnlgA3LFzA3XSkW0wrS3ohLEpKLhvsi+z4EQ33xDI37V1I4iWNIUWDbS432e OBSUtl+gb11mtTBmbZtoTQXNMAGvpXmjnVDliirERkfPXSukyc2vUi9P17oXvjY= =d0yK -----END PGP SIGNATURE----- --00GvhwF7k39YY--