diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-12 11:40:15 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-12 11:40:15 -0700 |
commit | 192c028b6ac972df25fd624f94a94d038fbdb66c (patch) | |
tree | 4dd9d13ffd239e4d7c61401f892989742c671fa8 /include/linux/tracepoint.h | |
parent | ea1990c3796e7550e6f240983f2d1b8e5ecf3891 (diff) | |
parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) |
Merge 3.14-rc6 into usb-next
We want the USB fixes in here as well.
Diffstat (limited to 'include/linux/tracepoint.h')
-rw-r--r-- | include/linux/tracepoint.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index accc497f8d7..7159a0a933d 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -60,6 +60,12 @@ struct tp_module { unsigned int num_tracepoints; struct tracepoint * const *tracepoints_ptrs; }; +bool trace_module_has_bad_taint(struct module *mod); +#else +static inline bool trace_module_has_bad_taint(struct module *mod) +{ + return false; +} #endif /* CONFIG_MODULES */ struct tracepoint_iter { |