Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1ec34e1..e7c6070 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -106,7 +106,7 @@ config LOCKDEP_SUPPORT
 config GENERIC_LOCKBREAK
        bool
        default y
-       depends on SMP && PREEMPT
+       depends on SMP && PREEMPTION
 
 config GENERIC_HWEIGHT
        bool
@@ -149,7 +149,7 @@ config PPC
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_WEAK_RELEASE_ACQUIRE
        select BINFMT_ELF
-       select BUILDTIME_EXTABLE_SORT
+       select BUILDTIME_TABLE_SORT
        select CLONE_BACKWARDS
        select DCACHE_WORD_ACCESS               if PPC64 && CPU_LITTLE_ENDIAN
        select DYNAMIC_FTRACE                   if FUNCTION_TRACER
@@ -455,11 +455,7 @@ config PPC_TRANSACTIONAL_MEM
 config PPC_UV
        bool "Ultravisor support"
        depends on KVM_BOOK3S_HV_POSSIBLE
-       select ZONE_DEVICE
-       select DEV_PAGEMAP_OPS
-       select DEVICE_PRIVATE
-       select MEMORY_HOTPLUG
-       select MEMORY_HOTREMOVE
+       depends on DEVICE_PRIVATE
        default n
        help
          This option paravirtualizes the kernel to run in POWER platforms that