diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:10 -0700 |
---|---|---|
committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:10 -0700 |
commit | d121f07691415df824e6b60520f782f6d13b3c81 (patch) | |
tree | 422ad3cc6fd631604fef4e469e49bacba8202e52 /drivers/hwtracing/stm/ftrace.c | |
parent | libnvdimm, namespace: remove redundant initialization of 'nd_mapping' (diff) | |
parent | dax: require 'struct page' by default for filesystem dax (diff) | |
download | linux-dev-d121f07691415df824e6b60520f782f6d13b3c81.tar.xz linux-dev-d121f07691415df824e6b60520f782f6d13b3c81.zip |
Merge branch 'for-4.16/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/hwtracing/stm/ftrace.c')
-rw-r--r-- | drivers/hwtracing/stm/ftrace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hwtracing/stm/ftrace.c b/drivers/hwtracing/stm/ftrace.c index bd126a7c6da2..7da75644c750 100644 --- a/drivers/hwtracing/stm/ftrace.c +++ b/drivers/hwtracing/stm/ftrace.c @@ -42,9 +42,11 @@ static struct stm_ftrace { * @len: length of the data packet */ static void notrace -stm_ftrace_write(const void *buf, unsigned int len) +stm_ftrace_write(struct trace_export *export, const void *buf, unsigned int len) { - stm_source_write(&stm_ftrace.data, STM_FTRACE_CHAN, buf, len); + struct stm_ftrace *stm = container_of(export, struct stm_ftrace, ftrace); + + stm_source_write(&stm->data, STM_FTRACE_CHAN, buf, len); } static int stm_ftrace_link(struct stm_source_data *data) |