From mboxrd@z Thu Jan 1 00:00:00 1970 From: dgoulet@efficios.com (David Goulet) Date: Fri, 31 Oct 2014 16:22:32 -0400 Subject: [lttng-dev] [PATCH lttng-tools 1/2] Fix: syscall list ioctl number conflict In-Reply-To: <1413845433-24348-1-git-send-email-mathieu.desnoyers@efficios.com> References: <1413845433-24348-1-git-send-email-mathieu.desnoyers@efficios.com> Message-ID: <20141031202232.GF24977@dalia> merged in 2.6.0-rc2 David On 20 Oct (18:50:32), Mathieu Desnoyers wrote: > Signed-off-by: Mathieu Desnoyers > --- > 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: