From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 6 Nov 2013 11:42:41 +0000 (+0000)
Subject: arm64: locks: Remove CONFIG_GENERIC_LOCKBREAK
X-Git-Tag: v3.13-rc1~162^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=61c77e0802719efce8966619cdc4234de7f252c1;p=linux.git

arm64: locks: Remove CONFIG_GENERIC_LOCKBREAK

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>
---

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index bbb5d9480130..ce6ae9497492 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -62,10 +62,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