Merge branch 'linux-2.6'

1 files changed, 8 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5e1083829d82..2bf2f3f53029 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -42,6 +42,9 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config ARCH_SETS_UP_PER_CPU_AREA
+        def_bool PPC64
+
 config IRQ_PER_CPU
         bool
         default y
@@ -53,6 +56,11 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config GENERIC_LOCKBREAK
+        bool
+        default y
+        depends on SMP && PREEMPT
+
 config ARCH_HAS_ILOG2_U32
         bool
         default y