diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2015-08-06 09:38:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-08-11 10:26:33 -0300 |
| commit | 9deb6ad661c1656dc770d35336a84b0d885c3ff2 (patch) | |
| tree | 227a0c3740da17a1ad6d6f9e3d5fd23f5aa2860d /drivers/media | |
| parent | b1304f9bdc3df8f213550b15cdfd7262420ef328 (diff) | |
| download | lwn-9deb6ad661c1656dc770d35336a84b0d885c3ff2.tar.gz lwn-9deb6ad661c1656dc770d35336a84b0d885c3ff2.zip | |
[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 2091f5181c66 ("[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/Makefile | 3 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 1 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-trace.c | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile index dc3de00d68b5..d1dd440d9d9b 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -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 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index ad7e929179ba..4a384fc765b8 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -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 diff --git a/drivers/media/v4l2-core/v4l2-trace.c b/drivers/media/v4l2-core/v4l2-trace.c new file mode 100644 index 000000000000..ae10b0248c8e --- /dev/null +++ b/drivers/media/v4l2-core/v4l2-trace.c @@ -0,0 +1,11 @@ +#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); |