[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.0906092250230.30552@gandalf.stny.rr.com>
Date: Tue, 9 Jun 2009 22:50:57 -0400 (EDT)
From: Steven Rostedt <rostedt@...dmis.org>
To: Li Zefan <lizf@...fujitsu.com>
cc: Ingo Molnar <mingo@...e.hu>, linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
Frederic Weisbecker <fweisbec@...il.com>
Subject: Re: [PATCH] tracing/events: convert block trace points to TRACE_EVENT(),
fix
On Wed, 10 Jun 2009, Li Zefan wrote:
> Fix building failures when CONFIG_BLOCK == n.
>
> [ Impact: build fix ]
>
> Signed-off-by: Li Zefan <lizf@...fujitsu.com>
> ---
> include/linux/blktrace_api.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
> index c7ec31d..7e4350e 100644
> --- a/include/linux/blktrace_api.h
> +++ b/include/linux/blktrace_api.h
> @@ -218,7 +218,7 @@ static inline int blk_trace_init_sysfs(struct device *dev)
>
> #endif /* CONFIG_BLK_DEV_IO_TRACE */
>
> -#ifdef CONFIG_EVENT_TRACING
> +#if defined(CONFIG_EVENT_TRACING) && defined(CONFIG_BLOCK)
>
> static inline int blk_cmd_buf_len(struct request *rq)
> {
> @@ -229,7 +229,7 @@ extern void blk_dump_cmd(char *buf, struct request *rq);
> extern void blk_fill_rwbs(char *rwbs, u32 rw, int bytes);
> extern void blk_fill_rwbs_rq(char *rwbs, struct request *rq);
>
> -#endif /* CONFIG_EVENT_TRACING */
> +#endif /* CONFIG_EVENT_TRACING && CONFIG_BLOCK */
>
> #endif /* __KERNEL__ */
> #endif
Heh, this is the exact same fix that I did. I'll throw mine out and take
yours, since it is your code ;-)
-- Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists