diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2018-10-29 19:20:00 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-10-29 19:20:00 -0400 |
commit | 35d7fc5e5603a593cd722363c251a0eacee87075 (patch) | |
tree | dd604732f7c0a94df999c8c4839b0f0243613c1b /include/linux/module.h | |
parent | 319829cc2bded42d163651b0575ec6371d8a5420 (diff) | |
parent | 3bf0fb6f33dd545693da5e65f5b1b9b9f0bfc35e (diff) | |
download | linux-next-35d7fc5e5603a593cd722363c251a0eacee87075.tar.gz |
Merge branch 'work.afs' into for-next
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 0add4e176a06..8fbeb16dde9f 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; |