diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:49:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:49:59 -0500 |
| commit | 3e72b810e30cdf4655279dd767eb798ac7a8fe5e (patch) | |
| tree | a6c8daae5390b44750dfc4ca9bc984430dd16e74 /kernel/sched.c | |
| parent | 9b269d4034c7855ac34f0985cc55ee29bd80e80a (diff) | |
| parent | c08f782985eed9959438368e84ce1d7f2ed03d95 (diff) | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
mutex: Fix missing conditions to build mutex_spin_on_owner()
mutex: Better control mutex adaptive spinning config
locking, task_struct: Reduce size on TRACE_IRQFLAGS and 64bit
locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
locking: Remove unused prototype
locking: Reduce ifdefs in kernel/spinlock.c
locking: Make inlining decision Kconfig based
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 3c11ae0a948d..ec0af1fcb195 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -5481,7 +5481,7 @@ need_resched_nonpreemptible: | |||
| 5481 | } | 5481 | } |
| 5482 | EXPORT_SYMBOL(schedule); | 5482 | EXPORT_SYMBOL(schedule); |
| 5483 | 5483 | ||
| 5484 | #ifdef CONFIG_SMP | 5484 | #ifdef CONFIG_MUTEX_SPIN_ON_OWNER |
| 5485 | /* | 5485 | /* |
| 5486 | * Look out! "owner" is an entirely speculative pointer | 5486 | * Look out! "owner" is an entirely speculative pointer |
| 5487 | * access and not reliable. | 5487 | * access and not reliable. |