From: Mathieu Desnoyers Date: Mon, 29 Apr 2013 17:11:46 +0000 (-0400) Subject: Fix: 3.9.0 block layer instrumentation build X-Git-Tag: v2.1.2~4 X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=1665dee9f59d0f53599e575ea55905593be3917f Fix: 3.9.0 block layer instrumentation build Linux upstream commit: commit 0a82a8d132b26d438eb90b3ab35a7016e7227a1d Author: Linus Torvalds Date: Thu Apr 18 09:00:26 2013 -0700 Revert "block: add missing block_bio_complete() tracepoint" Requires us to revert in lttng-modules too. Fixes #512 Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index e8258bfe..6782cbbe 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -313,11 +313,7 @@ TRACE_EVENT(block_bio_bounce, */ TRACE_EVENT(block_bio_complete, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) - TP_PROTO(struct bio *bio, int error), - - TP_ARGS(bio, error), -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) TP_PROTO(struct request_queue *q, struct bio *bio, int error), TP_ARGS(q, bio, error),