diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/mutex.c | 2 | ||||
-rw-r--r-- | kernel/sched.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index 200407c1502f..a5889fb28ecf 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
@@ -199,7 +199,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
199 | * memory barriers as we'll eventually observe the right | 199 | * memory barriers as we'll eventually observe the right |
200 | * values at the cost of a few extra spins. | 200 | * values at the cost of a few extra spins. |
201 | */ | 201 | */ |
202 | cpu_relax(); | 202 | arch_mutex_cpu_relax(); |
203 | } | 203 | } |
204 | #endif | 204 | #endif |
205 | spin_lock_mutex(&lock->wait_lock, flags); | 205 | spin_lock_mutex(&lock->wait_lock, flags); |
diff --git a/kernel/sched.c b/kernel/sched.c index 3e8a7db951a6..abe7aec55763 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -75,6 +75,7 @@ | |||
75 | 75 | ||
76 | #include <asm/tlb.h> | 76 | #include <asm/tlb.h> |
77 | #include <asm/irq_regs.h> | 77 | #include <asm/irq_regs.h> |
78 | #include <asm/mutex.h> | ||
78 | 79 | ||
79 | #include "sched_cpupri.h" | 80 | #include "sched_cpupri.h" |
80 | #include "workqueue_sched.h" | 81 | #include "workqueue_sched.h" |
@@ -3888,7 +3889,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) | |||
3888 | if (task_thread_info(rq->curr) != owner || need_resched()) | 3889 | if (task_thread_info(rq->curr) != owner || need_resched()) |
3889 | return 0; | 3890 | return 0; |
3890 | 3891 | ||
3891 | cpu_relax(); | 3892 | arch_mutex_cpu_relax(); |
3892 | } | 3893 | } |
3893 | 3894 | ||
3894 | return 1; | 3895 | return 1; |