Skip to content
  • Linus Torvalds's avatar
    Merge branch 'oprofile-for-linus' of... · 3aaf51ac
    Linus Torvalds authored
    Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
      oprofile/x86: make AMD IBS hotplug capable
      oprofile/x86: notify cpus only when daemon is running
      oprofile/x86: reordering some functions
      oprofile/x86: stop disabled counters in nmi handler
      oprofile/x86: protect cpu hotplug sections
      oprofile/x86: remove CONFIG_SMP macros
      oprofile/x86: fix uninitialized counter usage during cpu hotplug
      oprofile/x86: remove duplicate IBS capability check
      oprofile/x86: move IBS code
      oprofile/x86: return -EBUSY if counters are already reserved
      oprofile/x86: moving shutdown functions
      oprofile/x86: reserve counter msrs pairwise
      oprofile/x86: rework error handler in nmi_setup()
      oprofile: update file list in MAINTAINERS file
      oprofile: protect from not being in an IRQ context
      oprofile: remove double ring buffering
      ring-buffer: Add lost event count to end of sub buffer
      tracing: Show the lost events in the trace_pipe output
      ring-buffer: Add place holder recording of dropped events
      tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set
      ...
    3aaf51ac