zygo: stop playing whack-a-mole with GPL symbols (v4.2 part 2)

(cherry picked from commit cdcc25ac8dbec1bea05f4b82c85d5e465e297a9e)

zygo: drop GPL from lockdep_init_map
(cherry picked from commit 9bf82734b96f2a26133dcd1fcc037e1d1bca99ae)
(cherry picked from commit c8b6a475849a88f9c92d6f0f3d4a4a1b018ba7bd)
(cherry picked from commit ee2b2fad5eb61355157565d5bf0a0d0585706c94)

(cherry picked from commit bfabf9a4d8a583ba59fe6f99d90661fc9dd95119)
(cherry picked from commit aad4d22e43b6413b690130a81fee97bd5f6979e2)

zygo: drop GPL from mutex_lock_nested export
(cherry picked from commit 2c63d2149a7cac186068f3530b9a52ee8ea47c0f)
(cherry picked from commit 6da16bdeb0973337aa54b7e9132d71dd2e8271e3)
(cherry picked from commit be83f97598713c7ca7ec094d529895f8b6ea0242)

(cherry picked from commit cdaf217eede751f4ec7799f24b27d7e1a412f873)
(cherry picked from commit 111b66116a4445a21df70ec8c3709ae5518c79f8)

zygo: relicense debug_check_no_locks_held

(cherry picked from commit aeac8a9e7069ff08c48dbbb36bec294c97e7abf5)
(cherry picked from commit ee77f814b4ff3ff7492d47e2a991e6ae2224e1bf)

diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index afaecb7a799af235f63afb6877050cf348e4247c..13ee34a8478c899411c24fccb753f525e75f36f8 100644 (file)
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -78,7 +78,7 @@ bool rcu_gp_is_expedited(void)
 {
        return rcu_expedited || atomic_read(&rcu_expedited_nesting);
 }
-EXPORT_SYMBOL_GPL(rcu_gp_is_expedited);
+EXPORT_SYMBOL(rcu_gp_is_expedited);
 
 /**
  * rcu_expedite_gp - Expedite future RCU grace periods
@@ -91,7 +91,7 @@ void rcu_expedite_gp(void)
 {
        atomic_inc(&rcu_expedited_nesting);
 }
-EXPORT_SYMBOL_GPL(rcu_expedite_gp);
+EXPORT_SYMBOL(rcu_expedite_gp);
 
 /**
  * rcu_unexpedite_gp - Cancel prior rcu_expedite_gp() invocation
@@ -106,7 +106,7 @@ void rcu_unexpedite_gp(void)
 {
        atomic_dec(&rcu_expedited_nesting);
 }
-EXPORT_SYMBOL_GPL(rcu_unexpedite_gp);
+EXPORT_SYMBOL(rcu_unexpedite_gp);
 
 #endif /* #ifndef CONFIG_TINY_RCU */
 
@@ -131,7 +131,7 @@ void __rcu_read_lock(void)
        current->rcu_read_lock_nesting++;
        barrier();  /* critical section after entry code. */
 }
-EXPORT_SYMBOL_GPL(__rcu_read_lock);
+EXPORT_SYMBOL(__rcu_read_lock);
 
 /*
  * Preemptible RCU implementation for rcu_read_unlock().
@@ -163,7 +163,7 @@ void __rcu_read_unlock(void)
        }
 #endif /* #ifdef CONFIG_PROVE_LOCKING */
 }
-EXPORT_SYMBOL_GPL(__rcu_read_unlock);
+EXPORT_SYMBOL(__rcu_read_unlock);
 
 #endif /* #ifdef CONFIG_PREEMPT_RCU */
 
@@ -171,29 +171,29 @@ EXPORT_SYMBOL_GPL(__rcu_read_unlock);
 static struct lock_class_key rcu_lock_key;
 struct lockdep_map rcu_lock_map =
        STATIC_LOCKDEP_MAP_INIT("rcu_read_lock", &rcu_lock_key);
-EXPORT_SYMBOL_GPL(rcu_lock_map);
+EXPORT_SYMBOL(rcu_lock_map);
 
 static struct lock_class_key rcu_bh_lock_key;
 struct lockdep_map rcu_bh_lock_map =
        STATIC_LOCKDEP_MAP_INIT("rcu_read_lock_bh", &rcu_bh_lock_key);
-EXPORT_SYMBOL_GPL(rcu_bh_lock_map);
+EXPORT_SYMBOL(rcu_bh_lock_map);
 
 static struct lock_class_key rcu_sched_lock_key;
 struct lockdep_map rcu_sched_lock_map =
        STATIC_LOCKDEP_MAP_INIT("rcu_read_lock_sched", &rcu_sched_lock_key);
-EXPORT_SYMBOL_GPL(rcu_sched_lock_map);
+EXPORT_SYMBOL(rcu_sched_lock_map);
 
 static struct lock_class_key rcu_callback_key;
 struct lockdep_map rcu_callback_map =
        STATIC_LOCKDEP_MAP_INIT("rcu_callback", &rcu_callback_key);
-EXPORT_SYMBOL_GPL(rcu_callback_map);
+EXPORT_SYMBOL(rcu_callback_map);
 
 int notrace debug_lockdep_rcu_enabled(void)
 {
        return rcu_scheduler_active && debug_locks &&
               current->lockdep_recursion == 0;
 }
-EXPORT_SYMBOL_GPL(debug_lockdep_rcu_enabled);
+EXPORT_SYMBOL(debug_lockdep_rcu_enabled);
 
 /**
  * rcu_read_lock_held() - might we be in RCU read-side critical section?
@@ -225,7 +225,7 @@ int rcu_read_lock_held(void)
                return 0;
        return lock_is_held(&rcu_lock_map);
 }
-EXPORT_SYMBOL_GPL(rcu_read_lock_held);
+EXPORT_SYMBOL(rcu_read_lock_held);
 
 /**
  * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section?
@@ -252,7 +252,7 @@ int rcu_read_lock_bh_held(void)
                return 0;
        return in_softirq() || irqs_disabled();
 }
-EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
+EXPORT_SYMBOL(rcu_read_lock_bh_held);
 
 #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
 
@@ -282,7 +282,7 @@ void wait_rcu_gp(call_rcu_func_t crf)
        wait_for_completion(&rcu.completion);
        destroy_rcu_head_on_stack(&rcu.head);
 }
-EXPORT_SYMBOL_GPL(wait_rcu_gp);
+EXPORT_SYMBOL(wait_rcu_gp);
 
 #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD
 void init_rcu_head(struct rcu_head *head)
@@ -334,7 +334,7 @@ void init_rcu_head_on_stack(struct rcu_head *head)
 {
        debug_object_init_on_stack(head, &rcuhead_debug_descr);
 }
-EXPORT_SYMBOL_GPL(init_rcu_head_on_stack);
+EXPORT_SYMBOL(init_rcu_head_on_stack);
 
 /**
  * destroy_rcu_head_on_stack() - destroy on-stack rcu_head for debugobjects
@@ -351,13 +351,13 @@ void destroy_rcu_head_on_stack(struct rcu_head *head)
 {
        debug_object_free(head, &rcuhead_debug_descr);
 }
-EXPORT_SYMBOL_GPL(destroy_rcu_head_on_stack);
+EXPORT_SYMBOL(destroy_rcu_head_on_stack);
 
 struct debug_obj_descr rcuhead_debug_descr = {
        .name = "rcu_head",
        .fixup_activate = rcuhead_fixup_activate,
 };
-EXPORT_SYMBOL_GPL(rcuhead_debug_descr);
+EXPORT_SYMBOL(rcuhead_debug_descr);
 #endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */
 
 #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) || defined(CONFIG_RCU_TRACE)
@@ -367,7 +367,7 @@ void do_trace_rcu_torture_read(const char *rcutorturename, struct rcu_head *rhp,
 {
        trace_rcu_torture_read(rcutorturename, rhp, secs, c_old, c);
 }
-EXPORT_SYMBOL_GPL(do_trace_rcu_torture_read);
+EXPORT_SYMBOL(do_trace_rcu_torture_read);
 #else
 #define do_trace_rcu_torture_read(rcutorturename, rhp, secs, c_old, c) \
        do { } while (0)
@@ -485,7 +485,7 @@ void call_rcu_tasks(struct rcu_head *rhp, void (*func)(struct rcu_head *rhp))
                wake_up(&rcu_tasks_cbs_wq);
        }
 }
-EXPORT_SYMBOL_GPL(call_rcu_tasks);
+EXPORT_SYMBOL(call_rcu_tasks);
 
 /**
  * synchronize_rcu_tasks - wait until an rcu-tasks grace period has elapsed.
@@ -529,7 +529,7 @@ void synchronize_rcu_tasks(void)
        /* Wait for the grace period. */
        wait_rcu_gp(call_rcu_tasks);
 }
-EXPORT_SYMBOL_GPL(synchronize_rcu_tasks);
+EXPORT_SYMBOL(synchronize_rcu_tasks);
 
 /**
  * rcu_barrier_tasks - Wait for in-flight call_rcu_tasks() callbacks.
@@ -542,7 +542,7 @@ void rcu_barrier_tasks(void)
        /* There is only one callback queue, so this is easy.  ;-) */
        synchronize_rcu_tasks();
 }
-EXPORT_SYMBOL_GPL(rcu_barrier_tasks);
+EXPORT_SYMBOL(rcu_barrier_tasks);
 
 /* See if tasks are still holding out, complain if so. */
 static void check_holdout_task(struct task_struct *t,