tracing: make signs the same
PATCH 5/10 tracing: make signs the same
ftrace_format_##call() and ftrace_define_fields_##call() are inconsistent at signs of fields.
After reviewed codes, ftrace_format_##call() is correct, so we change ftrace_define_fields_##call().
Signed-off-by Lai Jiangshan <[email protected]>
---
include/trace/ftrace.h +4 -3
@@ -414,7 +414,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \BUILD_BUG_ON (len >MAX_FILTER_STR_VAL ); \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \ offsetof(typeof(field), item), \ - sizeof(field.item), 0, FILTER_OTHER); \ + sizeof(field.item), \ + is_signed_type(type), FILTER_OTHER); \ if (ret) \ return ret;
@@ -422,8 +423,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \#define __dynamic_array (type, item, len) \ ret = trace_define_field(event_call, "__data_loc " #type "[]", #item, \ offsetof(typeof(field), __data_loc_##item), \ - sizeof(field.__data_loc_##item), 0, \ - FILTER_OTHER); + sizeof(field.__data_loc_##item), \ + is_signed_type(type), FILTER_OTHER);#undef __string#define __string (item, src) __dynamic_array(char, item, -1)
kernel/trace/trace_export.c +4 -3
@@ -158,7 +158,8 @@ ftrace_format_##name(struct ftrace_event_call *unused, \BUILD_BUG_ON (len >MAX_FILTER_STR_VAL ); \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \ offsetof(typeof(field), item), \ - sizeof(field.item), 0, FILTER_OTHER); \ + sizeof(field.item), \ + is_signed_type(type), FILTER_OTHER); \ if (ret) \ return ret;
@@ -168,8 +169,8 @@ ftrace_format_##name(struct ftrace_event_call *unused, \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \ offsetof(typeof(field), \ container.item), \ - sizeof(field.container.item), 0, \ - FILTER_OTHER); \ + sizeof(field.container.item), \ + is_signed_type(type), FILTER_OTHER); \ if (ret) \ return ret;
[tip:tracing/urgent] tracing: Fix sign fields in ftrace_define_fields_##call()
Commit-ID: fb7ae981cb9fe8665b9da97e8734745e030c151d Gitweb: http://git.kernel.org/tip/fb7ae981cb9fe8665b9da97e8734745e030c151d Author: Lai Jiangshan <[email protected]> AuthorDate: Tue, 15 Dec 2009 15:39:38 +0800 Committer: Steven Rostedt <[email protected]> CommitDate: Wed, 30 Dec 2009 10:27:06 -0500
tracing: Fix sign fields in ftrace_define_fields_##call()
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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Steven Rostedt <[email protected]>
--- include/trace/ftrace.h | 7 ++++--- kernel/trace/trace_export.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-)
include/trace/ftrace.h +4 -3
@@ -414,7 +414,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \BUILD_BUG_ON (len >MAX_FILTER_STR_VAL ); \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \ offsetof(typeof(field), item), \ - sizeof(field.item), 0, FILTER_OTHER); \ + sizeof(field.item), \ + is_signed_type(type), FILTER_OTHER); \ if (ret) \ return ret;
@@ -422,8 +423,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \#define __dynamic_array (type, item, len) \ ret = trace_define_field(event_call, "__data_loc " #type "[]", #item, \ offsetof(typeof(field), __data_loc_##item), \ - sizeof(field.__data_loc_##item), 0, \ - FILTER_OTHER); + sizeof(field.__data_loc_##item), \ + is_signed_type(type), FILTER_OTHER);#undef __string#define __string (item, src) __dynamic_array(char, item, -1)
kernel/trace/trace_export.c +4 -3
@@ -158,7 +158,8 @@ ftrace_format_##name(struct ftrace_event_call *unused, \BUILD_BUG_ON (len >MAX_FILTER_STR_VAL ); \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \ offsetof(typeof(field), item), \ - sizeof(field.item), 0, FILTER_OTHER); \ + sizeof(field.item), \ + is_signed_type(type), FILTER_OTHER); \ if (ret) \ return ret;
@@ -168,8 +169,8 @@ ftrace_format_##name(struct ftrace_event_call *unused, \ ret = trace_define_field(event_call, #type "[" #len "]", #item, \ offsetof(typeof(field), \ container.item), \ - sizeof(field.container.item), 0, \ - FILTER_OTHER); \ + sizeof(field.container.item), \ + is_signed_type(type), FILTER_OTHER); \ if (ret) \ return ret;