Merge commit 'jwb/next' into next

1 files changed, 27 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index d11896b445b6..5c10af66fb51 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -410,6 +410,18 @@ config PPC_HAS_HASH_64K
         depends on PPC64
         default n
 
+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
@@ -445,6 +457,19 @@ config PPC_64K_PAGES
         bool "64k page size" if 44x || PPC_STD_MMU_64
         select PPC_HAS_HASH_64K if PPC_STD_MMU_64
 
+config PPC_256K_PAGES
+        bool "256k page size" if 44x
+        depends on !STDBINUTILS && (!SHMEM || BROKEN)
+        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.
+
 endchoice
 
 config FORCE_MAX_ZONEORDER
@@ -457,6 +482,8 @@ config FORCE_MAX_ZONEORDER
         default "9" if PPC_STD_MMU_32 && PPC_16K_PAGES
         range 7 64 if PPC_STD_MMU_32 && PPC_64K_PAGES
         default "7" if PPC_STD_MMU_32 && PPC_64K_PAGES
+        range 5 64 if PPC_STD_MMU_32 && PPC_256K_PAGES
+        default "5" if PPC_STD_MMU_32 && PPC_256K_PAGES
         range 11 64
         default "11"
         help