lkml.org 
[lkml]   [2009]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] tracing/events: convert block trace points to TRACE_EVENT(), fix
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 <lizf@cn.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 ;-)
>

Thanks! Either is fine for me. :)




\
 
 \ /
  Last update: 2009-06-10 04:57    [W:0.045 / U:4.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site