lib/genalloc: fix the overflow when size is too big

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e307f77..107bb43 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -66,7 +66,7 @@ config NEED_PER_CPU_PAGE_FIRST_CHUNK
 
 config NR_IRQS
        int "Number of virtual interrupt numbers"
-       range 32 32768
+       range 32 1048576
        default "512"
        help
          This defines the number of virtual interrupt numbers the kernel
@@ -87,7 +87,7 @@ config PPC_WATCHDOG
        help
          This is a placeholder when the powerpc hardlockup detector
          watchdog is selected (arch/powerpc/kernel/watchdog.c). It is
-         seleted via the generic lockup detector menu which is why we
+         selected via the generic lockup detector menu which is why we
          have no standalone config option for it here.
 
 config STACKTRACE_SUPPORT
@@ -161,6 +161,7 @@ config PPC
        select DCACHE_WORD_ACCESS               if PPC64 && CPU_LITTLE_ENDIAN
        select DMA_OPS                          if PPC64
        select DMA_OPS_BYPASS                   if PPC64
+       select ARCH_HAS_DMA_MAP_DIRECT          if PPC64 && PPC_PSERIES
        select DYNAMIC_FTRACE                   if FUNCTION_TRACER
        select EDAC_ATOMIC_SCRUB
        select EDAC_SUPPORT
@@ -177,6 +178,7 @@ config PPC
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select GENERIC_TIME_VSYSCALL
+       select GENERIC_GETTIMEOFDAY
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_HUGE_VMAP              if PPC_BOOK3S_64 && PPC_RADIX_MMU
        select HAVE_ARCH_JUMP_LABEL
@@ -207,6 +209,7 @@ config PPC
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
        select HAVE_GCC_PLUGINS                 if GCC_VERSION >= 50200   # plugin support on gcc <= 5.1 is buggy on PPC
+       select HAVE_GENERIC_VDSO
        select HAVE_HW_BREAKPOINT               if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
        select HAVE_IDE
        select HAVE_IOREMAP_PROT
@@ -312,6 +315,10 @@ config GENERIC_BUG
        default y
        depends on BUG
 
+config GENERIC_BUG_RELATIVE_POINTERS
+       def_bool y
+       depends on GENERIC_BUG
+
 config SYS_SUPPORTS_APM_EMULATION
        default y if PMAC_APM_EMU
        bool
@@ -418,6 +425,7 @@ config HUGETLB_PAGE_SIZE_VARIABLE
 config MATH_EMULATION
        bool "Math emulation"
        depends on 4xx || PPC_8xx || PPC_MPC832x || BOOKE
+       select PPC_FPU_REGS
        help
          Some PowerPC chips designed for embedded applications do not have
          a floating-point unit and therefore do not implement the
@@ -657,9 +665,15 @@ config IRQ_ALL_CPUS
          reported with SMP Power Macintoshes with this option enabled.
 
 config NUMA
-       bool "NUMA support"
-       depends on PPC64
-       default y if SMP && PPC_PSERIES
+       bool "NUMA Memory Allocation and Scheduler Support"
+       depends on PPC64 && SMP
+       default y if PPC_PSERIES || PPC_POWERNV
+       help
+         Enable NUMA (Non-Uniform Memory Access) support.
+
+         The kernel will try to allocate memory used by a CPU on the
+         local memory controller of the CPU and add some more
+         NUMA awareness to the kernel.
 
 config NODES_SHIFT
        int
@@ -793,8 +807,7 @@ config DATA_SHIFT_BOOL
        bool "Set custom data alignment"
        depends on ADVANCED_OPTIONS
        depends on STRICT_KERNEL_RWX || DEBUG_PAGEALLOC
-       depends on PPC_BOOK3S_32 || (PPC_8xx && !PIN_TLB_DATA && \
-                                    (!PIN_TLB_TEXT || !STRICT_KERNEL_RWX))
+       depends on PPC_BOOK3S_32 || (PPC_8xx && !PIN_TLB_DATA && !STRICT_KERNEL_RWX)
        help
          This option allows you to set the kernel data alignment. When
          RAM is mapped by blocks, the alignment needs to fit the size and