[GIT PULL] OProfile updates for tip

[GIT PULL] OProfile updates for tip

[Robert Richter]

Ingo,

please pull the latest oprofile branches into tip:

 git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git master
 git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

See the shortlog below.

Note: The master branch contains all oprofile changes including the
  multiplexing patches. This branch is similar to tip/master and for
  testing, linux-next and integration. The core branch contains
  patches that should go upstream. Pull requests for Linus' tree will
  have commit ids from this branch.

-Robert


Jason Yeh (1):
      oprofile: Implement performance counter multiplexing

Robert Richter (27):
      x86/oprofile: Fix cast of counter value
      x86/oprofile: Rework and simplify nmi_cpu_setup()
      x86/oprofile: Whitespaces changes only
      x86/oprofile: Fix usage of NUM_CONTROLS/NUM_COUNTERS macros
      x86/oprofile: Use per_cpu() instead of __get_cpu_var()
      x86/oprofile: Fix initialization of switch_index
      oprofile: oprofile_set_timeout(), return with error for invalid args
      oprofile: Rename variable timeout_jiffies and move to oprofile_files.c
      oprofile: Remove oprofile_multiplexing_init()
      oprofile: Grouping multiplexing code in oprof.c
      oprofile: Introduce op_x86_phys_to_virt()
      oprofile: Grouping multiplexing code in op_model_amd.c
      x86/oprofile: Implement multiplexing setup/shutdown functions
      x86/oprofile: Moving nmi_setup_cpu_mux() in nmi_int.c
      x86/oprofile: Moving nmi_cpu_save/restore_mpx_registers() in nmi_int.c
      x86/oprofile: Moving nmi_cpu_switch() in nmi_int.c
      x86/oprofile: Remove const qualifier from struct op_x86_model_spec
      x86/oprofile: Remove unused num_virt_controls from struct op_x86_model_spec
      x86/oprofile: Modify initialization of num_virt_counters
      x86/oprofile: Add function has_mux() to check multiplexing support
      x86/oprofile: Enable multiplexing only if the model supports it
      x86/oprofile: Implement mux_clone()
      oprofile: Adding switch counter to oprofile statistic variables
      x86/oprofile: Implement op_x86_virt_to_phys()
      x86/oprofile: Add counter reservation check for virtual counters
      x86/oprofile: Small coding style fixes
      Merge branches 'oprofile/core', 'oprofile/urgent', 'oprofile/mux' and 'oprofile/master'; commit 'tip/x86/urgent'; commit 'tip/oprofile' into oprofile/master

-- 
Advanced Micro Devices, Inc.
Operating System Research Center
email: robert.richter@amd.com

[GIT PULL] OProfile updates for tip

[Robert Richter]

Ingo,

please pull for tip/oprofile from:

 git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

Thanks,

-Robert

The following changes since commit c550091edd6fac2ed9dac1b30d986b6c58b216fa:
  Robert Richter (1):
        x86/oprofile: Small coding style fixes

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git core

Andrew Morton (1):
      arch/x86/oprofile/op_model_amd.c: fix op_amd_handle_ibs() return type

Robert Richter (1):
      Revert "x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs()"

 arch/x86/oprofile/op_model_amd.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

-- 
Advanced Micro Devices, Inc.
Operating System Research Center
email: robert.richter@amd.com