diff --git a/[refs] b/[refs] index b0a561bdd9c3..77dcf53ec89c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edf83015fcbff8976b75b42b565a77e9d450c567 +refs/heads/master: cdb3826b9958c204bc8ffda2cf9bbe2d899ef90c diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index bb43340d3973..12334aecf8ad 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -203,13 +203,6 @@ static void remove_vm_struct(struct vm_area_struct *vma) kmem_cache_free(vm_area_cachep, vma); } -/* - * sys_brk() for the most part doesn't need the global kernel - * lock, except when an application is doing something nasty - * like trying to un-brk an area that has already been mapped - * to a regular file. in this case, the unmapping will need - * to invoke file system routines that need the global lock. - */ asmlinkage unsigned long sys_brk(unsigned long brk) { unsigned long rlim, retval;