zygo: stop playing whack-a-mole with GPL symbols (v4.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/locking/lockdep.c b/kernel/locking/lockdep.c
index 8acfbf773e0623f187b8c6677ed48d63b6bd7eef..1fdcc3c448fa7c631580c5f71ecc113fc72762d7 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3020,10 +3020,10 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name,
                raw_local_irq_restore(flags);
        }
 }
-EXPORT_SYMBOL_GPL(lockdep_init_map);
+EXPORT_SYMBOL(lockdep_init_map);
 
 struct lock_class_key __lockdep_no_validate__;
-EXPORT_SYMBOL_GPL(__lockdep_no_validate__);
+EXPORT_SYMBOL(__lockdep_no_validate__);
 
 static int
 print_lock_nested_lock_not_held(struct task_struct *curr,
@@ -3562,7 +3562,7 @@ void lock_set_class(struct lockdep_map *lock, const char *name,
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_set_class);
+EXPORT_SYMBOL(lock_set_class);
 
 /*
  * We are not always called with irqs disabled - do that here,
@@ -3587,7 +3587,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_acquire);
+EXPORT_SYMBOL(lock_acquire);
 
 void lock_release(struct lockdep_map *lock, int nested,
                          unsigned long ip)
@@ -3606,7 +3606,7 @@ void lock_release(struct lockdep_map *lock, int nested,
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_release);
+EXPORT_SYMBOL(lock_release);
 
 int lock_is_held(struct lockdep_map *lock)
 {
@@ -3626,7 +3626,7 @@ int lock_is_held(struct lockdep_map *lock)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(lock_is_held);
+EXPORT_SYMBOL(lock_is_held);
 
 void lock_pin_lock(struct lockdep_map *lock)
 {
@@ -3833,7 +3833,7 @@ void lock_contended(struct lockdep_map *lock, unsigned long ip)
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_contended);
+EXPORT_SYMBOL(lock_contended);
 
 void lock_acquired(struct lockdep_map *lock, unsigned long ip)
 {
@@ -3852,7 +3852,7 @@ void lock_acquired(struct lockdep_map *lock, unsigned long ip)
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_acquired);
+EXPORT_SYMBOL(lock_acquired);
 #endif
 
 /*
@@ -4129,7 +4129,7 @@ void debug_check_no_locks_freed(const void *mem_from, unsigned long mem_len)
        }
        local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(debug_check_no_locks_freed);
+EXPORT_SYMBOL(debug_check_no_locks_freed);
 
 static void print_held_locks_bug(void)
 {
@@ -4154,7 +4154,7 @@ void debug_check_no_locks_held(void)
        if (unlikely(current->lockdep_depth > 0))
                print_held_locks_bug();
 }
-EXPORT_SYMBOL_GPL(debug_check_no_locks_held);
+EXPORT_SYMBOL(debug_check_no_locks_held);
 
 #ifdef __KERNEL__
 void debug_show_all_locks(void)
@@ -4213,7 +4213,7 @@ retry:
        if (unlock)
                read_unlock(&tasklist_lock);
 }
-EXPORT_SYMBOL_GPL(debug_show_all_locks);
+EXPORT_SYMBOL(debug_show_all_locks);
 #endif
 
 /*
@@ -4228,7 +4228,7 @@ void debug_show_held_locks(struct task_struct *task)
        }
        lockdep_print_held_locks(task);
 }
-EXPORT_SYMBOL_GPL(debug_show_held_locks);
+EXPORT_SYMBOL(debug_show_held_locks);
 
 asmlinkage __visible void lockdep_sys_exit(void)
 {
@@ -4297,4 +4297,4 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s)
        printk("\nstack backtrace:\n");
        dump_stack();
 }
-EXPORT_SYMBOL_GPL(lockdep_rcu_suspicious);
+EXPORT_SYMBOL(lockdep_rcu_suspicious);

diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index 4cccea6b8934f5697fa3dfa609ae4bd10db78b6f..b8171bdd0c228925d67064505470558d7dd67444 100644 (file)
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -618,7 +618,7 @@ mutex_lock_nested(struct mutex *lock, unsigned int subclass)
                            subclass, NULL, _RET_IP_, NULL, 0);
 }
 
-EXPORT_SYMBOL_GPL(mutex_lock_nested);
+EXPORT_SYMBOL(mutex_lock_nested);
 
 void __sched
 _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)