Merge branch 'highmem' into devel

1 files changed, 17 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cb4486ad0f72..e62b37a15a1d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -939,6 +939,23 @@ config NODES_SHIFT
         default "2"
         depends on NEED_MULTIPLE_NODES
 
+config HIGHMEM
+        bool "High Memory Support (EXPERIMENTAL)"
+        depends on MMU && EXPERIMENTAL
+        help
+          The address space of ARM processors is only 4 Gigabytes large
+          and it has to accommodate user address space, kernel address
+          space as well as some memory mapped IO. That means that, if you
+          have a large amount of physical memory and/or IO, not all of the
+          memory can be "permanently mapped" by the kernel. The physical
+          memory that is not permanently mapped is called "high memory".
+
+          Depending on the selected kernel/user memory split, minimum
+          vmalloc space and actual amount of RAM, you may not need this
+          option which should result in a slightly faster kernel.
+
+          If unsure, say n.
+
 source "mm/Kconfig"
 
 config LEDS