projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-sleep'
[cascardo/linux.git]
/
mm
/
nommu.c
diff --git
a/mm/nommu.c
b/mm/nommu.c
index
ecd1f15
..
fec093a
100644
(file)
--- a/
mm/nommu.c
+++ b/
mm/nommu.c
@@
-937,7
+937,7
@@
static int validate_mmap_request(struct file *file,
struct address_space *mapping;
/* files must support mmap */
struct address_space *mapping;
/* files must support mmap */
- if (!file->f_op
|| !file->f_op
->mmap)
+ if (!file->f_op->mmap)
return -ENODEV;
/* work out if what we've got could possibly be shared
return -ENODEV;
/* work out if what we've got could possibly be shared
@@
-1948,13
+1948,12
@@
int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
goto error;
}
goto error;
}
- allowed =
totalram_pages * sysctl_overcommit_ratio / 100
;
+ allowed =
vm_commit_limit()
;
/*
* Reserve some 3% for root
*/
if (!cap_sys_admin)
allowed -= sysctl_admin_reserve_kbytes >> (PAGE_SHIFT - 10);
/*
* Reserve some 3% for root
*/
if (!cap_sys_admin)
allowed -= sysctl_admin_reserve_kbytes >> (PAGE_SHIFT - 10);
- allowed += total_swap_pages;
/*
* Don't let a single process grow so big a user can't recover
/*
* Don't let a single process grow so big a user can't recover