arm64: locks: Remove CONFIG_GENERIC_LOCKBREAK
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 6 Nov 2013 11:42:41 +0000 (11:42 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 15 May 2014 19:00:56 +0000 (20:00 +0100)
Commit 52ea2a560a9d (arm64: locks: introduce ticket-based spinlock
implementation) introduces the arch_spin_is_contended() function making
CONFIG_GENERIC_LOCKBREAK unnecessary.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit 61c77e0802719efce8966619cdc4234de7f252c1)
Signed-off-by: Mark Brown <broonie@linaro.org>
arch/arm64/Kconfig

index 9115252e542541c85d13e093ae9bfd3ead95ddf1..0f24a85158419d8a94e61898c7d25b16e3a0e669 100644 (file)
@@ -63,10 +63,6 @@ config LOCKDEP_SUPPORT
 config TRACE_IRQFLAGS_SUPPORT
        def_bool y
 
-config GENERIC_LOCKBREAK
-       def_bool y
-       depends on SMP && PREEMPT
-
 config RWSEM_GENERIC_SPINLOCK
        def_bool y