X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fringbuffer%2Fring_buffer_splice.c;fp=src%2Flib%2Fringbuffer%2Fring_buffer_splice.c;h=b6580fa6d42359158195a086c79e16490728849a;hb=5f4c791e2ad2c814101ccdb500e65543f2792c41;hp=7b7e3d65156bb16813cf7012f5eb2e50c9679795;hpb=be06402dbdbea2f3394e60ec15c5d3356e2be416;p=deliverable%2Flttng-modules.git diff --git a/src/lib/ringbuffer/ring_buffer_splice.c b/src/lib/ringbuffer/ring_buffer_splice.c index 7b7e3d65..b6580fa6 100644 --- a/src/lib/ringbuffer/ring_buffer_splice.c +++ b/src/lib/ringbuffer/ring_buffer_splice.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -47,20 +47,20 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe, __free_page(pbuf->page); } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,8,0)) static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = { .release = lib_ring_buffer_pipe_buf_release, .try_steal = generic_pipe_buf_try_steal, .get = generic_pipe_buf_get }; -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0)) static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = { .confirm = generic_pipe_buf_confirm, .release = lib_ring_buffer_pipe_buf_release, .steal = generic_pipe_buf_steal, .get = generic_pipe_buf_get }; -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0)) static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = { .can_merge = 0, .confirm = generic_pipe_buf_confirm, @@ -108,7 +108,7 @@ static int subbuf_splice_actor(struct file *in, .pages = pages, .nr_pages = 0, .partial = partial, -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) +#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(4,12,0)) .flags = flags, #endif .ops = &ring_buffer_pipe_buf_ops,