Merge branch 'topic/func-profiler-offset' of git://git.kernel.org/pub/scm/linux/kerne...

Updates to the function profiler adds new options to tracefs. The options
are currently defined by an enum as flags. The added options brings the
number of options over 32, which means they can no longer be held in a 32
bit enum. The TRACE_ITER_* flags are converted to a macro TRACE_ITER(*) to
allow the creation of options to still be done by macros.

This change is intrusive, as it affects all TRACE_ITER* options throughout
the trace code. Merge the branch that added these options and converted
the TRACE_ITER_* enum into a TRACE_ITER(*) macro, to allow the topic
branches to still be developed without conflict.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

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

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

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

diff --cc kernel/trace/trace_syscalls.c
index 47d9771e8f7c992d97f51c429d85848b2654f90e,e2c679bd7ace155e2904539494f444992b9ed449..e07c5a3cc7abdd8e69b2435e63794cd016279853
--- 1/kernel/trace/trace_syscalls.c
--- 2/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@@ -262,15 -146,6 +262,15 @@@ print_syscall_enter(struct trace_iterat
                goto end;
        }
  
-               if (!tr || !(tr->trace_flags & TRACE_ITER_VERBOSE))
 +      switch (entry->syscall_nr) {
 +      case __NR_openat:
++              if (!tr || !(tr->trace_flags & TRACE_ITER(VERBOSE)))
 +                      return sys_enter_openat_print(trace, entry, s, event);
 +              break;
 +      default:
 +              break;
 +      }
 +
        trace_seq_printf(s, "%s(", entry->name);
  
        for (i = 0; i < entry->nb_args; i++) {