Skip to content
  • Linus Torvalds's avatar
    Merge tag 'trace-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 8df6be11
    Linus Torvalds authored
    Pull tracing fixes from Steven Rostedt:
     "Seems that Peter Zijlstra added a new check that is making old code
      scream nasty warnings:
    
        WARNING: CPU: 0 PID: 91 at kernel/sched/core.c:7253 __might_sleep+0x9a/0x378()
        do not call blocking ops when !TASK_RUNNING; state=1 set at [<ffffffff8d79b511>] event_test_thread+0x48/0x93
        Call Trace:
          __might_sleep+0x9a/0x378
          down_read+0x26/0x98
          exit_signals+0x27/0x1c2
          do_exit+0x193/0x10bd
          kthread+0x156/0x156
          ret_from_fork+0x7a/0xb0
    
      These are triggered by some self tests that run at start up when
      configure in.  Although the code is technically correct, they are a
      little sloppy and not very robust.  They work now because it runs at
      boot up and the tests do not call anything that might trigger a
      spurious wake up.  But that doesn't mean those tests wont change in
      the future.
    
      It's best to clean them now to make sure the tests used to test the
      internal workings of the system don't cause breakage themselves.
    
      This also quiets the warnings made by the new checks"
    
    * tag 'trace-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      tracing: Clean up scheduling in trace_wakeup_test_thread()
      tracing: Robustify wait loop
    8df6be11