Merge tag 'powerpc-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9141f03..2ffb229 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -196,7 +196,6 @@ config PPC
        select HAVE_STACKPROTECTOR              if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
        select HAVE_STACKPROTECTOR              if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
        select HAVE_CONTEXT_TRACKING            if PPC64
-       select HAVE_TIF_NOHZ                    if PPC64
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_DYNAMIC_FTRACE
@@ -503,18 +502,14 @@ config HOTPLUG_CPU
          Say N if you are unsure.
 
 config PPC_QUEUED_SPINLOCKS
-       bool "Queued spinlocks"
+       bool "Queued spinlocks" if EXPERT
        depends on SMP
+       default PPC_BOOK3S_64
        help
          Say Y here to use queued spinlocks which give better scalability and
          fairness on large SMP and NUMA systems without harming single threaded
          performance.
 
-         This option is currently experimental, the code is more complex and
-         less tested so it defaults to "N" for the moment.
-
-         If unsure, say "N".
-
 config ARCH_CPU_PROBE_RELEASE
        def_bool y
        depends on HOTPLUG_CPU
@@ -718,18 +713,6 @@ config ARCH_MEMORY_PROBE
        def_bool y
        depends on MEMORY_HOTPLUG
 
-config STDBINUTILS
-       bool "Using standard binutils settings"
-       depends on 44x
-       default y
-       help
-         Turning this option off allows you to select 256KB PAGE_SIZE on 44x.
-         Note, that kernel will be able to run only those applications,
-         which had been compiled using binutils later than 2.17.50.0.3 with
-         '-zmax-page-size' set to 256K (the default is 64K). Or, if using
-         the older binutils, you can patch them with a trivial patch, which
-         changes the ELF_MAXPAGESIZE definition from 0x10000 to 0x40000.
-
 choice
        prompt "Page size"
        default PPC_4K_PAGES
@@ -769,17 +752,15 @@ config PPC_64K_PAGES
        select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64
 
 config PPC_256K_PAGES
-       bool "256k page size"
-       depends on 44x && !STDBINUTILS
+       bool "256k page size (Requires non-standard binutils settings)"
+       depends on 44x && !PPC_47x
        help
          Make the page size 256k.
 
-         As the ELF standard only requires alignment to support page
-         sizes up to 64k, you will need to compile all of your user
-         space applications with a non-standard binutils settings
-         (see the STDBINUTILS description for details).
-
-         Say N unless you know what you are doing.
+         The kernel will only be able to run applications that have been
+         compiled with '-zmax-page-size' set to 256K (the default is 64K) using
+         binutils later than 2.17.50.0.3, or by patching the ELF_MAXPAGESIZE
+         definition from 0x10000 to 0x40000 in older versions.
 
 endchoice