zygo: GPL symbols in lockdep

(cherry picked from commit 1f82e04652f48413ae0e9ad808a55f55f3a2553d)

Conflicts:
	kernel/locking/lockdep.c

(cherry picked from commit 262281665f79c2587827d927f0cf30b62f1ed319)
(cherry picked from commit 61b1d9f43ae0c0f449448724bfc9c250799ff53b)
(cherry picked from commit 80a87dd4e84895dd3baa52bdf8f3fd63a8812b00)
(cherry picked from commit 8ede3395119abaf4cae8d784bf6a19b7a58971c9)
(cherry picked from commit 480d90d2e8d6ce3e112f2fa93580350ab583516c)
(cherry picked from commit 5dc468b2e6076734e5e06756b623120e058b1c51)
(cherry picked from commit 09ae67fb4ca28a3628b9ded6f5ecbc0959ab3d16)
(cherry picked from commit 09a33a189e2e0c967198ff99d8d027b3e8da089f)
(cherry picked from commit cb7f054139d3945201462085180733ac79dbc191)
(cherry picked from commit 48ce13db40f48a0169ab6cbf66de56dfaf357917)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 95932333a48b13cbdd8d0a86abba9fc32745b3fc..1b708c041c8eced8e91abeedc25bbc38ae0b6d06 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3150,7 +3150,7 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name,
 EXPORT_SYMBOL_GPL(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,
@@ -3801,7 +3801,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);
 
 void lock_downgrade(struct lockdep_map *lock, unsigned long ip)
 {
@@ -3818,7 +3818,7 @@ void lock_downgrade(struct lockdep_map *lock, unsigned long ip)
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_downgrade);
+EXPORT_SYMBOL(lock_downgrade);
 
 /*
  * We are not always called with irqs disabled - do that here,
@@ -3843,7 +3843,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)
@@ -3862,7 +3862,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_type(const struct lockdep_map *lock, int read)
 {
@@ -3882,7 +3882,7 @@ int lock_is_held_type(const struct lockdep_map *lock, int read)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(lock_is_held_type);
+EXPORT_SYMBOL(lock_is_held_type);
 
 struct pin_cookie lock_pin_lock(struct lockdep_map *lock)
 {
@@ -3902,7 +3902,7 @@ struct pin_cookie lock_pin_lock(struct lockdep_map *lock)
 
        return cookie;
 }
-EXPORT_SYMBOL_GPL(lock_pin_lock);
+EXPORT_SYMBOL(lock_pin_lock);
 
 void lock_repin_lock(struct lockdep_map *lock, struct pin_cookie cookie)
 {
@@ -3919,7 +3919,7 @@ void lock_repin_lock(struct lockdep_map *lock, struct pin_cookie cookie)
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_repin_lock);
+EXPORT_SYMBOL(lock_repin_lock);
 
 void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie cookie)
 {
@@ -3936,7 +3936,7 @@ void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie cookie)
        current->lockdep_recursion = 0;
        raw_local_irq_restore(flags);
 }
-EXPORT_SYMBOL_GPL(lock_unpin_lock);
+EXPORT_SYMBOL(lock_unpin_lock);
 
 #ifdef CONFIG_LOCK_STAT
 static int
@@ -4077,7 +4077,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)
 {
@@ -4096,7 +4096,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
 
 /*
@@ -4352,7 +4352,7 @@ void debug_check_no_locks_freed(const void *mem_from, unsigned long mem_len)
        }
        raw_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)
 {
@@ -4377,7 +4377,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)
@@ -4403,7 +4403,7 @@ void debug_show_all_locks(void)
        pr_warn("\n");
        pr_warn("=============================================\n\n");
 }
-EXPORT_SYMBOL_GPL(debug_show_all_locks);
+EXPORT_SYMBOL(debug_show_all_locks);
 #endif
 
 /*
@@ -4418,7 +4418,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)
 {
@@ -4489,4 +4489,4 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s)
        pr_warn("\nstack backtrace:\n");
        dump_stack();
 }
-EXPORT_SYMBOL_GPL(lockdep_rcu_suspicious);
+EXPORT_SYMBOL(lockdep_rcu_suspicious);