diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 16:39:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 16:39:21 -0400 |
| commit | ba77d20ff56028128259a9282d06b938073f169c (patch) | |
| tree | a88789b94dd8d404aa2747b9974768166c7baa67 /arch/ia64/Kconfig | |
| parent | 0d9df2515dbceb67d343c0f10fd3ff218380d524 (diff) | |
| parent | 2c86963b093c1a0887dfc6b32c6e5ea3a80f2922 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] implement ticket locks for Itanium
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 6851e52ed5a2..1ee596cd942f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -60,9 +60,7 @@ config IOMMU_HELPER | |||
| 60 | bool | 60 | bool |
| 61 | 61 | ||
| 62 | config GENERIC_LOCKBREAK | 62 | config GENERIC_LOCKBREAK |
| 63 | bool | 63 | def_bool n |
| 64 | default y | ||
| 65 | depends on SMP && PREEMPT | ||
| 66 | 64 | ||
| 67 | config RWSEM_XCHGADD_ALGORITHM | 65 | config RWSEM_XCHGADD_ALGORITHM |
| 68 | bool | 66 | bool |