Merge commit 'origin/master' into next

[deliverable/linux.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 8101de490c73941ab8815733a3899c614cdb8cb7..34579b23ebd55ebed1a99a5473c6ca0693b559e2 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -88,6 +88,9 @@ int sysctl_overcommit_ratio = 50;     /* default is 50% */
 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
 struct percpu_counter vm_committed_as;
 
+/* amount of vm to protect from userspace access */
+unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+
 /*
  * Check that a process has enough memory to allocate a new virtual
  * mapping. 0 means there is enough memory for the allocation to