tracing: make the trace clocks available generally (56449f43) · Commits · 戴 / test

Jeremy Fitzhardinge reported this build failure: LD .tmp_vmlinux1 arch/x86/kernel/built-in.o: In function `ds_take_timestamp': git/linux/arch/x86/kernel/ds.c:1380: undefined reference to `trace_clock_global' git/linux/arch/x86/kernel/ds.c:1380: undefined reference to `trace_clock_global' Which is due to !CONFIG_TRACING && CONFIG_X86_DS=y. Expose the trace clock code to CONFIG_X86_DS as well. [ Unfortunately librarizing doesnt work well - ancient architectures with no raw_local_irq_save() primitive break the build. ] Reported-by:

Jeremy Fitzhardinge <jeremy@goop.org> LKML-Reference: <49E4413F.7070700@goop.org> Signed-off-by:

Ingo Molnar <mingo@elte.hu>

kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,7 @@ obj-$(CONFIG_LATENCYTOP) += latencytop.o
		obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
		obj-$(CONFIG_FUNCTION_TRACER) += trace/
		obj-$(CONFIG_TRACING) += trace/
		obj-$(CONFIG_X86_DS) += trace/
		obj-$(CONFIG_SMP) += sched_cpupri.o
		obj-$(CONFIG_SLOW_WORK) += slow-work.o

kernel/trace/Makefile

+6 −1

Original line number	Diff line number	Diff line
		@@ -15,11 +15,16 @@ ifdef CONFIG_TRACING_BRANCHES
		KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
		endif

		#
		# Make the trace clocks available generally: it's infrastructure
		# relied on by ptrace for example:
		#
		obj-y += trace_clock.o

		obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o
		obj-$(CONFIG_RING_BUFFER) += ring_buffer.o

		obj-$(CONFIG_TRACING) += trace.o
		obj-$(CONFIG_TRACING) += trace_clock.o
		obj-$(CONFIG_TRACING) += trace_output.o
		obj-$(CONFIG_TRACING) += trace_stat.o
		obj-$(CONFIG_TRACING) += trace_printk.o

Admin message