diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-31 23:51:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-31 23:51:22 +0100 |
| commit | f3124ba519b42426525585f50dbde3235b1fb89a (patch) | |
| tree | 5343d6c4ea4e88d6b6a8af75d701553d258ea334 /include/trace | |
| parent | 7dcba49cf6c1fd2d6ec1bead821fdd85e84bdc1f (diff) | |
| parent | a2e124daef622d8745510ab24b023027dcdc9146 (diff) | |
Merge tag 'v3.10.35' into linux-linaro-lsk
This is the 3.10.35 stable release
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/ftrace.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 66dba42128d7..dbb47418df81 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -299,15 +299,12 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = { \ #undef __array #define __array(type, item, len) \ do { \ - mutex_lock(&event_storage_mutex); \ + char *type_str = #type"["__stringify(len)"]"; \ BUILD_BUG_ON(len > MAX_FILTER_STR_VAL); \ - snprintf(event_storage, sizeof(event_storage), \ - "%s[%d]", #type, len); \ - ret = trace_define_field(event_call, event_storage, #item, \ + ret = trace_define_field(event_call, type_str, #item, \ offsetof(typeof(field), item), \ sizeof(field.item), \ is_signed_type(type), FILTER_OTHER); \ - mutex_unlock(&event_storage_mutex); \ if (ret) \ return ret; \ } while (0); |