• Linus Torvalds's avatar
    Merge tag 'trace-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · f26db964
    Linus Torvalds authored
    Pull tracing fixes from Steven Rostedt:
     "There was some breakage with the changes for jump labels in the 4.11
      merge window:
    
       - powerpc broke as jump labels uses the two LSB bits as flags in
         initialization.
    
         A check was added to make sure that all jump label entries were 4
         bytes aligned, but powerpc didn't work that way for modules. Adding
         an alignment in the module linker script appeared to be the best
         solution.
    
       - Jump labels also added an anonymous union to access those LSB bits
         as a normal long. But because this structure had static
         initialization, it broke older compilers that could not statically
         initialize anonymous unions without brackets.
    
       - The command line parameter for setting function graph filter broke
         the "EMPTY_HASH" descriptor by modifying it instead of creating a
         new hash to hold the entries.
    
       - The command line parameter ftrace_graph_max_depth was added to
         allow its setting at boot time. It uses existing code and only the
         command line hook was added.
    
         This is not really a fix, but as it uses existing code without
         affecting anything else, I added it to this release. It was ready
         before the merge window closed, but I wanted to let it sit in
         linux-next for a couple of days first"
    
    * tag 'trace-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      ftrace/graph: Add ftrace_graph_max_depth kernel parameter
      tracing: Add #undef to fix compile error
      jump_label: Add comment about initialization order for anonymous unions
      jump_label: Fix anonymous union initialization
      module: set __jump_table alignment to 8
      ftrace/graph: Do not modify the EMPTY_HASH for the function_graph filter
      tracing: Fix code comment for ftrace_ops_get_func()
    f26db964
jump_label.h 12.3 KB