Merge branch 'master' into x86/memblock

[platform/adaptation/renesas_rcar/renesas_kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 7c56971..e338407 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -137,6 +137,9 @@ config HAVE_MEMBLOCK_NODE_MAP
 config ARCH_DISCARD_MEMBLOCK
        boolean
 
+config NO_BOOTMEM
+       boolean
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
@@ -362,7 +365,7 @@ config CLEANCACHE
          for clean pages that the kernel's pageframe replacement algorithm
          (PFRA) would like to keep around, but can't since there isn't enough
          memory.  So when the PFRA "evicts" a page, it first attempts to use
-         cleancacne code to put the data contained in that page into
+         cleancache code to put the data contained in that page into
          "transcendent memory", memory that is not directly accessible or
          addressable by the kernel and is of unknown and possibly
          time-varying size.  And when a cleancache-enabled