diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-18 07:29:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-18 07:29:05 +0200 |
| commit | 9bd871df56a752029b07dde326d799648994b992 (patch) | |
| tree | ce407ad9aec3e77792dc8692d5e5e93dba07f54c /include/linux/module.h | |
| parent | Merge branch 'parisc-4.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
| parent | tracing: Use trace_clock_local() for looping in preemptirq_delay_test.c (diff) | |
| download | wireguard-linux-9bd871df56a752029b07dde326d799648994b992.tar.xz wireguard-linux-9bd871df56a752029b07dde326d799648994b992.zip | |
Merge tag 'trace-v4.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Steven writes:
"tracing: Two fixes for 4.19
This fixes two bugs:
- Fix size mismatch of tracepoint array
- Have preemptirq test module use same clock source of the selftest"
* tag 'trace-v4.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Use trace_clock_local() for looping in preemptirq_delay_test.c
tracepoint: Fix tracepoint array element size mismatch
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index f807f15bebbe..e19ae08c7fb8 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -20,6 +20,7 @@ #include <linux/export.h> #include <linux/rbtree_latch.h> #include <linux/error-injection.h> +#include <linux/tracepoint-defs.h> #include <linux/percpu.h> #include <asm/module.h> @@ -430,7 +431,7 @@ struct module { #ifdef CONFIG_TRACEPOINTS unsigned int num_tracepoints; - struct tracepoint * const *tracepoints_ptrs; + tracepoint_ptr_t *tracepoints_ptrs; #endif #ifdef HAVE_JUMP_LABEL struct jump_entry *jump_entries; |