---

yaml --- r: 248565 b: refs/heads/master c: 6875669 h: refs/heads/master i: 248563: 6a7a1c4 v: v3
git-mirror · Apr 10, 2011 · 9fa2655 · 9fa2655
1 parent 2e7616e
commit 9fa2655
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eab04a87677a37cf15b52e2b4b4fd57917102ad
+refs/heads/master: 687566990640e476aeeed844947f2ecadc4717d3
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
@@ -144,9 +144,6 @@ config HAVE_CLK
 config HAVE_DMA_API_DEBUG
 	bool
 
-config HAVE_DEFAULT_NO_SPIN_MUTEXES
-	bool
-
 config HAVE_HW_BREAKPOINT
 	bool
 	depends on PERF_EVENTS

diff --git a/trunk/kernel/Kconfig.locks b/trunk/kernel/Kconfig.locks
@@ -199,4 +199,4 @@ config INLINE_WRITE_UNLOCK_IRQRESTORE
 	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 
 config MUTEX_SPIN_ON_OWNER
-	def_bool SMP && !DEBUG_MUTEXES && !HAVE_DEFAULT_NO_SPIN_MUTEXES
+	def_bool SMP && !DEBUG_MUTEXES