aboutsummaryrefslogtreecommitdiffstats
path: root/mm/mmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/mmap.c')
-rw-r--r--mm/mmap.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 404319477e..12334aecf8 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -61,7 +61,7 @@ pgprot_t protection_map[16] = {
61 61
62int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ 62int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
63int sysctl_overcommit_ratio = 50; /* default is 50% */ 63int sysctl_overcommit_ratio = 50; /* default is 50% */
64int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; 64int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
65atomic_t vm_committed_space = ATOMIC_INIT(0); 65atomic_t vm_committed_space = ATOMIC_INIT(0);
66 66
67/* 67/*
@@ -203,13 +203,6 @@ static void remove_vm_struct(struct vm_area_struct *vma)
203 kmem_cache_free(vm_area_cachep, vma); 203 kmem_cache_free(vm_area_cachep, vma);
204} 204}
205 205
206/*
207 * sys_brk() for the most part doesn't need the global kernel
208 * lock, except when an application is doing something nasty
209 * like trying to un-brk an area that has already been mapped
210 * to a regular file. in this case, the unmapping will need
211 * to invoke file system routines that need the global lock.
212 */
213asmlinkage unsigned long sys_brk(unsigned long brk) 206asmlinkage unsigned long sys_brk(unsigned long brk)
214{ 207{
215 unsigned long rlim, retval; 208 unsigned long rlim, retval;