From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754332AbZFJCze (ORCPT ); Tue, 9 Jun 2009 22:55:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752768AbZFJCz1 (ORCPT ); Tue, 9 Jun 2009 22:55:27 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:52361 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751742AbZFJCz0 (ORCPT ); Tue, 9 Jun 2009 22:55:26 -0400 Message-ID: <4A2F20F3.3050209@cn.fujitsu.com> Date: Wed, 10 Jun 2009 10:56:51 +0800 From: Li Zefan User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: Steven Rostedt CC: Ingo Molnar , linux-kernel@vger.kernel.org, Andrew Morton , Frederic Weisbecker Subject: Re: [PATCH] tracing/events: convert block trace points to TRACE_EVENT(), fix References: <20090609163657.557589106@goodmis.org> <20090609234655.GA24118@elte.hu> <4A2F0C4A.8020109@cn.fujitsu.com> <4A2F0E26.9010203@cn.fujitsu.com> <4A2F1126.5010306@cn.fujitsu.com> <4A2F1520.8020003@cn.fujitsu.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Steven Rostedt wrote: > On Wed, 10 Jun 2009, Li Zefan wrote: > >> Fix building failures when CONFIG_BLOCK == n. >> >> [ Impact: build fix ] >> >> Signed-off-by: Li Zefan >> --- >> 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 ;-) > Thanks! Either is fine for me. :)