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 /init | |
| 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 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index eb4b33725db1..2e9a1457132c 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1220,3 +1220,4 @@ source "block/Kconfig" | |||
| 1220 | config PREEMPT_NOTIFIERS | 1220 | config PREEMPT_NOTIFIERS |
| 1221 | bool | 1221 | bool |
| 1222 | 1222 | ||
| 1223 | source "kernel/Kconfig.locks" | ||