lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracing: Fix sign fields in ftrace_define_fields_##call()

Browse Source 
Add is_signed_type() call to trace_define_field() in ftrace macros.

The code previously just passed in 0 (false), disregarding whether
or not the field was actually a signed type.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
LKML-Reference: <4B273D3A.6020007@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Lai Jiangshan
2009-12-15 15:39:38 +08:00
committed by Steven Rostedt
parent e96dc9674c
commit fb7ae981cb
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/trace/ftrace.h
View File

@@ -414,7 +414,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \
BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \
ret = trace_define_field(event_call, #type "[" #len "]", #item, \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \
offsetof(typeof(field), item), \ offsetof(typeof(field), item), \
sizeof(field.item), 0, FILTER_OTHER); \ sizeof(field.item), \
is_signed_type(type), FILTER_OTHER); \
if (ret) \ if (ret) \
return ret; return ret;
@@ -422,8 +423,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \
#define __dynamic_array(type, item, len) \ #define __dynamic_array(type, item, len) \
ret = trace_define_field(event_call, "__data_loc " #type "[]", #item, \ ret = trace_define_field(event_call, "__data_loc " #type "[]", #item, \
offsetof(typeof(field), __data_loc_##item), \ offsetof(typeof(field), __data_loc_##item), \
sizeof(field.__data_loc_##item), 0, \ sizeof(field.__data_loc_##item), \
FILTER_OTHER); is_signed_type(type), FILTER_OTHER);
#undef __string #undef __string
#define __string(item, src) __dynamic_array(char, item, -1) #define __string(item, src) __dynamic_array(char, item, -1)

7
kernel/trace/trace_export.c
View File

@@ -158,7 +158,8 @@ ftrace_format_##name(struct ftrace_event_call *unused, \
BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \
ret = trace_define_field(event_call, #type "[" #len "]", #item, \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \
offsetof(typeof(field), item), \ offsetof(typeof(field), item), \
sizeof(field.item), 0, FILTER_OTHER); \ sizeof(field.item), \
is_signed_type(type), FILTER_OTHER); \
if (ret) \ if (ret) \
return ret; return ret;
@@ -168,8 +169,8 @@ ftrace_format_##name(struct ftrace_event_call *unused, \
ret = trace_define_field(event_call, #type "[" #len "]", #item, \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \
offsetof(typeof(field), \ offsetof(typeof(field), \
container.item), \ container.item), \
sizeof(field.container.item), 0, \ sizeof(field.container.item), \
FILTER_OTHER); \ is_signed_type(type), FILTER_OTHER); \
if (ret) \ if (ret) \
return ret; return ret;