[PATCH] ppc64: remove SPINLINE config option

After the spinlock rework, CONFIG_SPINLINE doesnt work and causes a compile
error.  Remove it for now.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/Kconfig.debug b/arch/ppc64/Kconfig.debug
index 2c72a73833d43227b47bd23861f976a8596609ab..c3cd4c747a2dd09697cc613256afde2195f4889a 100644 (file)
--- a/arch/ppc64/Kconfig.debug
+++ b/arch/ppc64/Kconfig.debug
@@ -44,16 +44,6 @@ config IRQSTACKS
          for handling hard and soft interrupts.  This can help avoid
          overflowing the process kernel stacks.
 
-config SPINLINE
-       bool "Inline spinlock code at each call site"
-       depends on SMP && !PPC_SPLPAR && !PPC_ISERIES
-       help
-         Say Y if you want to have the code for acquiring spinlocks
-         and rwlocks inlined at each call site.  This makes the kernel
-         somewhat bigger, but can be useful when profiling the kernel.
-
-         If in doubt, say N.
-
 config SCHEDSTATS
        bool "Collect scheduler statistics"
        depends on DEBUG_KERNEL && PROC_FS

diff --git a/arch/ppc64/lib/locks.c b/arch/ppc64/lib/locks.c
index 5bf838b3bc37cb5a6ad4a2f462fa8b297a68735d..72d642d7e5a2f9cac0e91ad51eb4bb73c46ddca9 100644 (file)
--- a/arch/ppc64/lib/locks.c
+++ b/arch/ppc64/lib/locks.c
@@ -20,8 +20,6 @@
 #include <asm/hvcall.h>
 #include <asm/iSeries/HvCall.h>
 
-#ifndef CONFIG_SPINLINE
-
 /* waiting for a spinlock... */
 #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
 
@@ -95,5 +93,3 @@ void spin_unlock_wait(spinlock_t *lock)
 }
 
 EXPORT_SYMBOL(spin_unlock_wait);
-
-#endif /* CONFIG_SPINLINE */