Merge branch 'fixes' into next

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 7aa12e8..26331cd 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -11,7 +11,7 @@ config 64BIT
 
 config LIVEPATCH_64
        def_bool PPC64
 
 config LIVEPATCH_64
        def_bool PPC64

-       depends on LIVEPATCH
+       depends on LIVEPATCH

 
 config MMU
        bool
 
 config MMU
        bool


@@ -193,6 +193,7 @@ config PPC
        select HAVE_ARCH_JUMP_LABEL_RELATIVE
        select HAVE_ARCH_KASAN                  if PPC32 && PPC_PAGE_SHIFT <= 14
        select HAVE_ARCH_KASAN                  if PPC_RADIX_MMU
        select HAVE_ARCH_JUMP_LABEL_RELATIVE
        select HAVE_ARCH_KASAN                  if PPC32 && PPC_PAGE_SHIFT <= 14
        select HAVE_ARCH_KASAN                  if PPC_RADIX_MMU

+       select HAVE_ARCH_KASAN                  if PPC_BOOK3E_64

        select HAVE_ARCH_KASAN_VMALLOC          if HAVE_ARCH_KASAN
        select HAVE_ARCH_KFENCE                 if PPC_BOOK3S_32 || PPC_8xx || 40x
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_KASAN_VMALLOC          if HAVE_ARCH_KASAN
        select HAVE_ARCH_KFENCE                 if PPC_BOOK3S_32 || PPC_8xx || 40x
        select HAVE_ARCH_KGDB


@@ -254,6 +255,7 @@ config PPC
        select IOMMU_HELPER                     if PPC64
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select IOMMU_HELPER                     if PPC64
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING

+       select KASAN_VMALLOC                    if KASAN && MODULES

        select MMU_GATHER_PAGE_SIZE
        select MMU_GATHER_RCU_TABLE_FREE
        select MODULES_USE_ELF_RELA
        select MMU_GATHER_PAGE_SIZE
        select MMU_GATHER_RCU_TABLE_FREE
        select MODULES_USE_ELF_RELA


@@ -449,7 +451,7 @@ choice
        default MATH_EMULATION_FULL
        depends on MATH_EMULATION
 
        default MATH_EMULATION_FULL
        depends on MATH_EMULATION
 

-config MATH_EMULATION_FULL
+config MATH_EMULATION_FULL

        bool "Emulate all the floating point instructions"
        help
          Select this option will enable the kernel to support to emulate
        bool "Emulate all the floating point instructions"
        help
          Select this option will enable the kernel to support to emulate


@@ -1252,7 +1254,7 @@ config PHYSICAL_START
        default "0x00000000"
 endif
 
        default "0x00000000"
 endif
 

-config ARCH_RANDOM
+config ARCH_RANDOM

        def_bool n
 
 config PPC_LIB_RHEAP
        def_bool n
 
 config PPC_LIB_RHEAP