From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Mar 2019 15:59:36 +0000 (-0800)
Subject: Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.1-rc1~163
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=203b6609e0ede49eb0b97008b1150c69e9d2ffd3;p=tomoyo%2Ftomoyo-test1.git

Merge branch 'perf-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar:
 "Lots of tooling updates - too many to list, here's a few highlights:

   - Various subcommand updates to 'perf trace', 'perf report', 'perf
     record', 'perf annotate', 'perf script', 'perf test', etc.

   - CPU and NUMA topology and affinity handling improvements,

   - HW tracing and HW support updates:
      - Intel PT updates
      - ARM CoreSight updates
      - vendor HW event updates

   - BPF updates

   - Tons of infrastructure updates, both on the build system and the
     library support side

   - Documentation updates.

   - ... and lots of other changes, see the changelog for details.

  Kernel side updates:

   - Tighten up kprobes blacklist handling, reduce the number of places
     where developers can install a kprobe and hang/crash the system.

   - Fix/enhance vma address filter handling.

   - Various PMU driver updates, small fixes and additions.

   - refcount_t conversions

   - BPF updates

   - error code propagation enhancements

   - misc other changes"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (238 commits)
  perf script python: Add Python3 support to syscall-counts-by-pid.py
  perf script python: Add Python3 support to syscall-counts.py
  perf script python: Add Python3 support to stat-cpi.py
  perf script python: Add Python3 support to stackcollapse.py
  perf script python: Add Python3 support to sctop.py
  perf script python: Add Python3 support to powerpc-hcalls.py
  perf script python: Add Python3 support to net_dropmonitor.py
  perf script python: Add Python3 support to mem-phys-addr.py
  perf script python: Add Python3 support to failed-syscalls-by-pid.py
  perf script python: Add Python3 support to netdev-times.py
  perf tools: Add perf_exe() helper to find perf binary
  perf script: Handle missing fields with -F +..
  perf data: Add perf_data__open_dir_data function
  perf data: Add perf_data__(create_dir|close_dir) functions
  perf data: Fail check_backup in case of error
  perf data: Make check_backup work over directories
  perf tools: Add rm_rf_perf_data function
  perf tools: Add pattern name checking to rm_rf
  perf tools: Add depth checking to rm_rf
  perf data: Add global path holder
  ...
---

203b6609e0ede49eb0b97008b1150c69e9d2ffd3
diff --cc kernel/locking/lockdep.c
index fda370ca529c,bc35a54ae3d4..21cb81fe6359
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@@ -51,7 -50,7 +51,8 @@@
  #include <linux/random.h>
  #include <linux/jhash.h>
  #include <linux/nmi.h>
 +#include <linux/rcupdate.h>
+ #include <linux/kprobes.h>
  
  #include <asm/sections.h>
  
diff --cc kernel/rcu/tree.c
index 3b084dbfb4bc,74db52a0a466..acd6ccf56faf
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -49,7 -62,7 +49,8 @@@
  #include <linux/suspend.h>
  #include <linux/ftrace.h>
  #include <linux/tick.h>
 +#include <linux/sysrq.h>
+ #include <linux/kprobes.h>
  
  #include "tree.h"
  #include "rcu.h"