diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:22:43 -0400 |
| commit | d811f236d90e58c67092eaadacab609e76c38749 (patch) | |
| tree | 52b7d911948cf6a50f9a54abb6b91890ff9a8a72 /kernel | |
| parent | 29a1e26febf4bd6eecab2a17a056c177d3627788 (diff) | |
| parent | 066123a535927b3f17cac2305258cc71abdb0d92 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
percpu: unbreak alpha percpu
mutex: have non-spinning mutexes on s390 by default
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/mutex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index 5d79781394a3..507cf2b5e9f1 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
| @@ -148,7 +148,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
| 148 | 148 | ||
| 149 | preempt_disable(); | 149 | preempt_disable(); |
| 150 | mutex_acquire(&lock->dep_map, subclass, 0, ip); | 150 | mutex_acquire(&lock->dep_map, subclass, 0, ip); |
| 151 | #if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES) | 151 | #if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES) && \ |
| 152 | !defined(CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES) | ||
| 152 | /* | 153 | /* |
| 153 | * Optimistic spinning. | 154 | * Optimistic spinning. |
| 154 | * | 155 | * |