]> git.hungrycats.org Git - linux/commitdiff
zygo: GPL symbols in kernel/locking
authorZygo Blaxell <zblaxell@waya.furryterror.org>
Wed, 15 Feb 2017 07:01:14 +0000 (02:01 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Tue, 12 Mar 2019 02:17:54 +0000 (22:17 -0400)
(cherry picked from commit 694a67d62663e2ada4af14bd6eb1f33c89958baf)

Conflicts:
kernel/locking/mutex.c

(cherry picked from commit 9c6b2df6be8a3ade370e6812322db2437f207587)
(cherry picked from commit db64b1264e58dd5be69db3d73df1c9ec93f2117f)
(cherry picked from commit 673a8581669d2ee322bad3e291e85eeb3c5b94fc)
(cherry picked from commit 3640785c1d5144526cb562ac61e21e27ee78a0c2)
(cherry picked from commit f3c7da3d2a2500f3ea590adccb4d5027b45332f3)
(cherry picked from commit f2421168bf2328d4935f5459fdf69ad013bf709a)
(cherry picked from commit 1687381054e5a75ab7a824821adf868fa5e277de)
(cherry picked from commit fe7283f0159b7f51c795cf2b08c5a7d3f6b5501a)
(cherry picked from commit 8c47f1b16a17e0aa6cf1b5df0c2d2d736454e778)
(cherry picked from commit acb9831dfbc5cbe761a3f5289f2c4d9bea084edb)

kernel/locking/mutex.c

index db578783dd36a3efc87b2bd052ba1353438850ed..d1ed95e8386e4c53a2d8fb5ebcb323b8554a3726 100644 (file)
@@ -1087,28 +1087,29 @@ mutex_lock_nested(struct mutex *lock, unsigned int subclass)
        __mutex_lock(lock, TASK_UNINTERRUPTIBLE, subclass, NULL, _RET_IP_);
 }
 
-EXPORT_SYMBOL_GPL(mutex_lock_nested);
+EXPORT_SYMBOL(mutex_lock_nested);
 
 void __sched
 _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)
 {
        __mutex_lock(lock, TASK_UNINTERRUPTIBLE, 0, nest, _RET_IP_);
 }
-EXPORT_SYMBOL_GPL(_mutex_lock_nest_lock);
+EXPORT_SYMBOL(_mutex_lock_nest_lock);
 
 int __sched
 mutex_lock_killable_nested(struct mutex *lock, unsigned int subclass)
 {
        return __mutex_lock(lock, TASK_KILLABLE, subclass, NULL, _RET_IP_);
 }
-EXPORT_SYMBOL_GPL(mutex_lock_killable_nested);
+EXPORT_SYMBOL(mutex_lock_killable_nested);
 
 int __sched
 mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass)
 {
        return __mutex_lock(lock, TASK_INTERRUPTIBLE, subclass, NULL, _RET_IP_);
 }
-EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested);
+
+EXPORT_SYMBOL(mutex_lock_interruptible_nested);
 
 void __sched
 mutex_lock_io_nested(struct mutex *lock, unsigned int subclass)
@@ -1164,7 +1165,7 @@ ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(ww_mutex_lock);
+EXPORT_SYMBOL(ww_mutex_lock);
 
 int __sched
 ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
@@ -1181,7 +1182,7 @@ ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(ww_mutex_lock_interruptible);
+EXPORT_SYMBOL(ww_mutex_lock_interruptible);
 
 #endif