git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
mm
/
mmap.c
diff --git
a/mm/mmap.c
b/mm/mmap.c
index
6446c61
..
c1868ec
100644
(file)
--- a/
mm/mmap.c
+++ b/
mm/mmap.c
@@
-96,7
+96,7
@@
int __vm_enough_memory(long pages, int cap_sys_admin)
if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) {
unsigned long n;
- free = g
et_page_cache_size(
);
+ free = g
lobal_page_state(NR_FILE_PAGES
);
free += nr_swap_pages;
/*