Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

Pull tracing updates from

 - allow module init functions to be traced

 - clean up some unused or not used by config events (saves space)

 - clean up of trace histogram code

 - add support for preempt and interrupt enabled/disable events

 - other various clean ups

* tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (30 commits)
  tracing, thermal: Hide cpu cooling trace events when not in use
  tracing, thermal: Hide devfreq trace events when not in use
  ftrace: Kill FTRACE_OPS_FL_PER_CPU
  perf/ftrace: Small cleanup
  perf/ftrace: Fix function trace events
  perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on ftrace:function")
  tracing, dma-buf: Remove unused trace event dma_fence_annotate_wait_on
  tracing, memcg, vmscan: Hide trace events when not in use
  tracing/xen: Hide events that are not used when X86_PAE is not defined
  tracing: mark trace_test_buffer as __maybe_unused
  printk: Remove superfluous memory barriers from printk_safe
  ftrace: Clear hashes of stale ips of init memory
  tracing: Add support for preempt and irq enable/disable events
  tracing: Prepare to add preempt and irq trace events
  ftrace/kallsyms: Have /proc/kallsyms show saved mod init functions
  ftrace: Add freeing algorithm to free ftrace_mod_maps
  ftrace: Save module init functions kallsyms symbols for tracing
  ftrace: Allow module init functions to be traced
  ftrace: Add a ftrace_free_mem() function for modules to use
  tracing: Reimplement log2
  ...

diff --cc include/linux/ftrace.h
Simple merge

diff --cc include/linux/init.h
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc include/linux/trace_events.h
index 84014ecfa67ff284fc6b657e565e57ea12d9c89e,ca4e67e466a79d92090416ba50aabfadacdba50b..af44e7c2d577e8f0bd7c50f12ca70deeb4714dcc
--- 1/include/linux/trace_events.h
--- 2/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@@ -542,11 -512,10 +547,11 @@@ void perf_trace_run_bpf_submit(void *ra
  static inline void
  perf_trace_buf_submit(void *raw_data, int size, int rctx, u16 type,
                       u64 count, struct pt_regs *regs, void *head,
-                      struct task_struct *task, struct perf_event *event)
+                      struct task_struct *task)
  {
-       perf_tp_event(type, count, raw_data, size, regs, head, rctx, task, event);
+       perf_tp_event(type, count, raw_data, size, regs, head, rctx, task);
  }
 +
  #endif
  
  #endif /* _LINUX_TRACE_EVENT_H */

diff --cc include/trace/events/dma_fence.h
Simple merge

diff --cc include/trace/events/thermal.h
Simple merge

diff --cc include/trace/events/vmscan.h
Simple merge

diff --cc include/trace/events/xen.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/kallsyms.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/Makefile
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc kernel/trace/trace_selftest.c
Simple merge

diff --cc kernel/trace/trace_syscalls.c
Simple merge

diff --cc kernel/trace/trace_uprobe.c
Simple merge

diff --cc kernel/trace/tracing_map.h
Simple merge