From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 6 Aug 2012 17:43:42 +0000 (+0100)
Subject: ARM: 7484/1: Don't enable GENERIC_LOCKBREAK with ticket spinlocks
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f1898f6be9a2e3690fb62d8307849b86a89cc36c;p=linux.git

ARM: 7484/1: Don't enable GENERIC_LOCKBREAK with ticket spinlocks

Now that ARM has implemented its spinlocks with tickets we don't
need to use the generic lockbreak algorithm. Remove the Kconfig
from ARM so that we use the arch_spin_is_contended() definition
from the asm header. This also saves a word in each lock because
we don't need the break_lock member anymore.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e91c7cdc6fe5c..e4191ccbdb7ac 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -126,11 +126,6 @@ config TRACE_IRQFLAGS_SUPPORT
 	bool
 	default y
 
-config GENERIC_LOCKBREAK
-	bool
-	default y
-	depends on SMP && PREEMPT
-
 config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y