Merge tag 'powerpc-5.2-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/power...

[sfrench/cifs-2.6.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index fa7219ffeadc96b0d11d625b87cd0b7f3dc5b1d4..d7996cfacecaee9c007c4c3fe65769906c977e14 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -167,6 +167,7 @@ config PPC
        select GENERIC_TIME_VSYSCALL
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_JUMP_LABEL
        select GENERIC_TIME_VSYSCALL
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_JUMP_LABEL

+       select HAVE_ARCH_KASAN                  if PPC32

        select HAVE_ARCH_KGDB
        select HAVE_ARCH_MMAP_RND_BITS
        select HAVE_ARCH_MMAP_RND_COMPAT_BITS   if COMPAT
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_MMAP_RND_BITS
        select HAVE_ARCH_MMAP_RND_COMPAT_BITS   if COMPAT


@@ -375,7 +376,6 @@ config ZONE_DMA
 config PGTABLE_LEVELS
        int
        default 2 if !PPC64
 config PGTABLE_LEVELS
        int
        default 2 if !PPC64

-       default 3 if PPC_64K_PAGES && !PPC_BOOK3S_64

        default 4
 
 source "arch/powerpc/sysdev/Kconfig"
        default 4
 
 source "arch/powerpc/sysdev/Kconfig"


@@ -391,7 +391,7 @@ source "kernel/Kconfig.hz"
 
 config HUGETLB_PAGE_SIZE_VARIABLE
        bool
 
 config HUGETLB_PAGE_SIZE_VARIABLE
        bool

-       depends on HUGETLB_PAGE
+       depends on HUGETLB_PAGE && PPC_BOOK3S_64

        default y
 
 config MATH_EMULATION
        default y
 
 config MATH_EMULATION


@@ -832,9 +832,9 @@ config CMDLINE_BOOL
        bool "Default bootloader kernel arguments"
 
 config CMDLINE
        bool "Default bootloader kernel arguments"
 
 config CMDLINE

-       string "Initial kernel command string"
-       depends on CMDLINE_BOOL
-       default "console=ttyS0,9600 console=tty0 root=/dev/sda2"
+       string "Initial kernel command string" if CMDLINE_BOOL
+       default "console=ttyS0,9600 console=tty0 root=/dev/sda2" if CMDLINE_BOOL
+       default ""

        help
          On some platforms, there is currently no way for the boot loader to
          pass arguments to the kernel. For these platforms, you can supply
        help
          On some platforms, there is currently no way for the boot loader to
          pass arguments to the kernel. For these platforms, you can supply