* [lttng-dev] [PATCH lttng-tools 1/2] Fix: syscall list ioctl number conflict
[not found] <1413845433-24348-1-git-send-email-mathieu.desnoyers@efficios.com>
@ 2014-10-31 20:22 ` David Goulet
0 siblings, 0 replies; only message in thread
From: David Goulet @ 2014-10-31 20:22 UTC (permalink / raw)
merged in 2.6.0-rc2
David
On 20 Oct (18:50:32), Mathieu Desnoyers wrote:
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
> src/common/kernel-ctl/kernel-ioctl.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/common/kernel-ctl/kernel-ioctl.h b/src/common/kernel-ctl/kernel-ioctl.h
> index c88f970..475a066 100644
> --- a/src/common/kernel-ctl/kernel-ioctl.h
> +++ b/src/common/kernel-ctl/kernel-ioctl.h
> @@ -103,7 +103,7 @@
> #define LTTNG_KERNEL_WAIT_QUIESCENT _IO(0xF6, 0x48)
> #define LTTNG_KERNEL_CALIBRATE \
> _IOWR(0xF6, 0x49, struct lttng_kernel_calibrate)
> -#define LTTNG_KERNEL_SYSCALL_LIST _IO(0xF6, 0x49)
> +#define LTTNG_KERNEL_SYSCALL_LIST _IO(0xF6, 0x4A)
>
> /* Session FD ioctl */
> #define LTTNG_KERNEL_METADATA \
> --
> 2.1.0
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: Digital signature
URL: <http://lists.lttng.org/pipermail/lttng-dev/attachments/20141031/9dd46ed1/attachment.sig>
^ permalink raw reply [flat|nested] only message in thread