Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RCU updates from Ingo Molnar:
 "The biggest RCU changes in this cycle were:

   - Convert RCU's BUG_ON() and similar calls to WARN_ON() and similar.

   - Replace calls of RCU-bh and RCU-sched update-side functions to
     their vanilla RCU counterparts. This series is a step towards
     complete removal of the RCU-bh and RCU-sched update-side functions.

     ( Note that some of these conversions are going upstream via their
       respective maintainers. )

   - Documentation updates, including a number of flavor-consolidation
     updates from Joel Fernandes.

   - Miscellaneous fixes.

   - Automate generation of the initrd filesystem used for rcutorture
     testing.

   - Convert spin_is_locked() assertions to instead use lockdep.

     ( Note that some of these conversions are going upstream via their
       respective maintainers. )

   - SRCU updates, especially including a fix from Dennis Krein for a
     bag-on-head-class bug.

   - RCU torture-test updates"

* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (112 commits)
  rcutorture: Don't do busted forward-progress testing
  rcutorture: Use 100ms buckets for forward-progress callback histograms
  rcutorture: Recover from OOM during forward-progress tests
  rcutorture: Print forward-progress test age upon failure
  rcutorture: Print time since GP end upon forward-progress failure
  rcutorture: Print histogram of CB invocation at OOM time
  rcutorture: Print GP age upon forward-progress failure
  rcu: Print per-CPU callback counts for forward-progress failures
  rcu: Account for nocb-CPU callback counts in RCU CPU stall warnings
  rcutorture: Dump grace-period diagnostics upon forward-progress OOM
  rcutorture: Prepare for asynchronous access to rcu_fwd_startat
  torture: Remove unnecessary "ret" variables
  rcutorture: Affinity forward-progress test to avoid housekeeping CPUs
  rcutorture: Break up too-long rcu_torture_fwd_prog() function
  rcutorture: Remove cbflood facility
  torture: Bring any extra CPUs online during kernel startup
  rcutorture: Add call_rcu() flooding forward-progress tests
  rcutorture/formal: Replace synchronize_sched() with synchronize_rcu()
  tools/kernel.h: Replace synchronize_sched() with synchronize_rcu()
  net/decnet: Replace rcu_barrier_bh() with rcu_barrier()
  ...

1 files changed, 35 insertions, 0 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c883ec55654f..377f373db6c0 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -573,6 +573,27 @@ foreach my $entry (@mode_permission_funcs) {
 }
 $mode_perms_search = "(?:${mode_perms_search})";
 
+our %deprecated_apis = (
+        "synchronize_rcu_bh"                    => "synchronize_rcu",
+        "synchronize_rcu_bh_expedited"          => "synchronize_rcu_expedited",
+        "call_rcu_bh"                           => "call_rcu",
+        "rcu_barrier_bh"                        => "rcu_barrier",
+        "synchronize_sched"                     => "synchronize_rcu",
+        "synchronize_sched_expedited"           => "synchronize_rcu_expedited",
+        "call_rcu_sched"                        => "call_rcu",
+        "rcu_barrier_sched"                     => "rcu_barrier",
+        "get_state_synchronize_sched"           => "get_state_synchronize_rcu",
+        "cond_synchronize_sched"                => "cond_synchronize_rcu",
+);
+
+#Create a search pattern for all these strings to speed up a loop below
+our $deprecated_apis_search = "";
+foreach my $entry (keys %deprecated_apis) {
+        $deprecated_apis_search .= '|' if ($deprecated_apis_search ne "");
+        $deprecated_apis_search .= $entry;
+}
+$deprecated_apis_search = "(?:${deprecated_apis_search})";
+
 our $mode_perms_world_writable = qr{
         S_IWUGO         |
         S_IWOTH         |
@@ -6368,6 +6389,20 @@ sub process {
                              "please use device_initcall() or more appropriate function instead of __initcall() (see include/linux/init.h)\n" . $herecurr);
                 }
 
+# check for spin_is_locked(), suggest lockdep instead
+                if ($line =~ /\bspin_is_locked\(/) {
+                        WARN("USE_LOCKDEP",
+                             "Where possible, use lockdep_assert_held instead of assertions based on spin_is_locked\n" . $herecurr);
+                }
+
+# check for deprecated apis
+                if ($line =~ /\b($deprecated_apis_search)\b\s*\(/) {
+                        my $deprecated_api = $1;
+                        my $new_api = $deprecated_apis{$deprecated_api};
+                        WARN("DEPRECATED_API",
+                             "Deprecated use of '$deprecated_api', prefer '$new_api' instead\n" . $herecurr);
+                }
+
 # check for various structs that are normally const (ops, kgdb, device_tree)
 # and avoid what seem like struct definitions 'struct foo {'
                 if ($line !~ /\bconst\b/ &&