[media] v4l2: move tracepoint generation into separate file (9deb6ad6) · Commits · 戴 / test

To compile videobuf2-core as a module, the vb2_* tracepoints must be exported from the videodev module. Instead of exporting vb2 tracepoint symbols from v4l2-ioctl.c, move the tracepoint generation into a separate file. This patch fixes the following build error in the modpost stage, introduced by ("[media] videobuf2: add trace events"): ERROR: "__tracepoint_vb2_buf_done" undefined! ERROR: "__tracepoint_vb2_dqbuf" undefined! ERROR: "__tracepoint_vb2_qbuf" undefined! ERROR: "__tracepoint_vb2_buf_queue" undefined! Suggested-by:

Steven Rostedt <rostedt@goodmis.org> Signed-off-by:

Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by:

Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@osg.samsung.com>

drivers/media/v4l2-core/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@ endif
		ifeq ($(CONFIG_OF),y)
		videodev-objs += v4l2-of.o
		endif
		ifeq ($(CONFIG_TRACEPOINTS),y)
		videodev-objs += v4l2-trace.o
		endif

		obj-$(CONFIG_VIDEO_V4L2) += videodev.o
		obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o

drivers/media/v4l2-core/v4l2-ioctl.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		#include <media/v4l2-device.h>
		#include <media/videobuf2-core.h>

		#define CREATE_TRACE_POINTS
		#include <trace/events/v4l2.h>

		/* Zero out the end of the struct pointed to by p. Everything after, but

drivers/media/v4l2-core/v4l2-trace.c

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		#include <media/v4l2-common.h>
		#include <media/v4l2-fh.h>
		#include <media/videobuf2-core.h>

		#define CREATE_TRACE_POINTS
		#include <trace/events/v4l2.h>

		EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_buf_done);
		EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_buf_queue);
		EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_dqbuf);
		EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_qbuf);

Admin message