Commit 9deb6ad6 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab

[media] v4l2: move tracepoint generation into separate file

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 2091f518 ("[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: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent b1304f9b
...@@ -13,6 +13,9 @@ endif ...@@ -13,6 +13,9 @@ endif
ifeq ($(CONFIG_OF),y) ifeq ($(CONFIG_OF),y)
videodev-objs += v4l2-of.o videodev-objs += v4l2-of.o
endif endif
ifeq ($(CONFIG_TRACEPOINTS),y)
videodev-objs += v4l2-trace.o
endif
obj-$(CONFIG_VIDEO_V4L2) += videodev.o obj-$(CONFIG_VIDEO_V4L2) += videodev.o
obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/videobuf2-core.h> #include <media/videobuf2-core.h>
#define CREATE_TRACE_POINTS
#include <trace/events/v4l2.h> #include <trace/events/v4l2.h>
/* Zero out the end of the struct pointed to by p. Everything after, but /* Zero out the end of the struct pointed to by p. Everything after, but
......
#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);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment