diff options
Diffstat (limited to 'kernel/mutex.c')
| -rw-r--r-- | kernel/mutex.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index 12c779dc65d4..4f45d4b658ef 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
| @@ -59,7 +59,7 @@ EXPORT_SYMBOL(__mutex_init); | |||
| 59 | * We also put the fastpath first in the kernel image, to make sure the | 59 | * We also put the fastpath first in the kernel image, to make sure the |
| 60 | * branch is predicted by the CPU as default-untaken. | 60 | * branch is predicted by the CPU as default-untaken. |
| 61 | */ | 61 | */ |
| 62 | static void noinline __sched | 62 | static __used noinline void __sched |
| 63 | __mutex_lock_slowpath(atomic_t *lock_count); | 63 | __mutex_lock_slowpath(atomic_t *lock_count); |
| 64 | 64 | ||
| 65 | /*** | 65 | /*** |
| @@ -96,7 +96,7 @@ void inline __sched mutex_lock(struct mutex *lock) | |||
| 96 | EXPORT_SYMBOL(mutex_lock); | 96 | EXPORT_SYMBOL(mutex_lock); |
| 97 | #endif | 97 | #endif |
| 98 | 98 | ||
| 99 | static noinline void __sched __mutex_unlock_slowpath(atomic_t *lock_count); | 99 | static __used noinline void __sched __mutex_unlock_slowpath(atomic_t *lock_count); |
| 100 | 100 | ||
| 101 | /*** | 101 | /*** |
| 102 | * mutex_unlock - release the mutex | 102 | * mutex_unlock - release the mutex |
| @@ -184,7 +184,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | done: | 186 | done: |
| 187 | lock_acquired(&lock->dep_map); | 187 | lock_acquired(&lock->dep_map, ip); |
| 188 | /* got the lock - rejoice! */ | 188 | /* got the lock - rejoice! */ |
| 189 | mutex_remove_waiter(lock, &waiter, task_thread_info(task)); | 189 | mutex_remove_waiter(lock, &waiter, task_thread_info(task)); |
| 190 | debug_mutex_set_owner(lock, task_thread_info(task)); | 190 | debug_mutex_set_owner(lock, task_thread_info(task)); |
| @@ -268,7 +268,7 @@ __mutex_unlock_common_slowpath(atomic_t *lock_count, int nested) | |||
| 268 | /* | 268 | /* |
| 269 | * Release the lock, slowpath: | 269 | * Release the lock, slowpath: |
| 270 | */ | 270 | */ |
| 271 | static noinline void | 271 | static __used noinline void |
| 272 | __mutex_unlock_slowpath(atomic_t *lock_count) | 272 | __mutex_unlock_slowpath(atomic_t *lock_count) |
| 273 | { | 273 | { |
| 274 | __mutex_unlock_common_slowpath(lock_count, 1); | 274 | __mutex_unlock_common_slowpath(lock_count, 1); |
| @@ -313,7 +313,7 @@ int __sched mutex_lock_killable(struct mutex *lock) | |||
| 313 | } | 313 | } |
| 314 | EXPORT_SYMBOL(mutex_lock_killable); | 314 | EXPORT_SYMBOL(mutex_lock_killable); |
| 315 | 315 | ||
| 316 | static noinline void __sched | 316 | static __used noinline void __sched |
| 317 | __mutex_lock_slowpath(atomic_t *lock_count) | 317 | __mutex_lock_slowpath(atomic_t *lock_count) |
| 318 | { | 318 | { |
| 319 | struct mutex *lock = container_of(lock_count, struct mutex, count); | 319 | struct mutex *lock = container_of(lock_count, struct mutex, count); |
