Ingo,

please pull oprofile fixes for v3.2 (tip/perf/urgent):

  git://amd64.org/linux/rric.git urgent

and oprofile updates for v3.3 (tip/perf/core):

  git://amd64.org/linux/rric.git core

The urgent branch is a subset of core and intended for v3.2. It only
contains patches marked also for stable.

The merge is to resolve conflicts with perf/core.

See also here:

 http://www.amd64.org/gitweb/?p=linux/rric.git;a=summary

Commit ids:

 de346b6 Merge branch 'perf/core' into oprofile/master
 dcfce4a oprofile, x86: Reimplement nmi timer mode using perf event
 75c43a2 oprofile: Remove exit function for timer mode
 159a80b oprofile, x86: Add kernel parameter oprofile.cpu_type=timer
 97f7f81 oprofile, x86: Fix crash when unloading module (nmi timer mode)
 87121ca oprofile: Fix crash when unloading module (hr timer mode)

Thanks,

-Robert



The following changes since commit 886605636e656afeb6fad5e83dbf36967f65cfa5:

  perf report: Add progress bar when processing time ordered events (2011-11-02 12:28:35 -0200)

are available in the git repository at:
  git://amd64.org/linux/rric core

Robert Richter (6):
      oprofile: Fix crash when unloading module (hr timer mode)
      oprofile, x86: Fix crash when unloading module (nmi timer mode)
      oprofile, x86: Add kernel parameter oprofile.cpu_type=timer
      oprofile: Remove exit function for timer mode
      oprofile, x86: Reimplement nmi timer mode using perf event
      Merge branch 'perf/core' into oprofile/master

 Documentation/kernel-parameters.txt |    3 +
 arch/Kconfig                        |    4 +
 arch/x86/oprofile/Makefile          |    3 +-
 arch/x86/oprofile/init.c            |   25 ++----
 arch/x86/oprofile/nmi_int.c         |   27 ++++-
 arch/x86/oprofile/nmi_timer_int.c   |   50 ----------
 drivers/oprofile/nmi_timer_int.c    |  173 +++++++++++++++++++++++++++++++++++
 drivers/oprofile/oprof.c            |   21 ++++-
 drivers/oprofile/oprof.h            |    9 ++
 drivers/oprofile/timer_int.c        |   29 +++---
 kernel/events/core.c                |    2 +
 11 files changed, 252 insertions(+), 94 deletions(-)
 delete mode 100644 arch/x86/oprofile/nmi_timer_int.c
 create mode 100644 drivers/oprofile/nmi_timer_int.c

-- 
Advanced Micro Devices, Inc.
Operating System Research Center