diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 22:40:27 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 22:40:27 +0200 |
| commit | c1b054d03f5b31c33eaa0b267c629b118eaf3790 (patch) | |
| tree | 9333907ca767be24fcb3667877242976c3e3c8dd /mm/mmap.c | |
| parent | Update Chelsio gige net driver. (diff) | |
| parent | [PATCH] missing include in smc-ultra (diff) | |
| download | linux-c1b054d03f5b31c33eaa0b267c629b118eaf3790.tar.xz linux-c1b054d03f5b31c33eaa0b267c629b118eaf3790.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'mm/mmap.c')
| -rw-r--r-- | mm/mmap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index da3fa90a0aae..404319477e71 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -143,7 +143,11 @@ int __vm_enough_memory(long pages, int cap_sys_admin) leave 3% of the size of this process for other processes */ allowed -= current->mm->total_vm / 32; - if (atomic_read(&vm_committed_space) < allowed) + /* + * cast `allowed' as a signed long because vm_committed_space + * sometimes has a negative value + */ + if (atomic_read(&vm_committed_space) < (long)allowed) return 0; vm_unacct_memory(pages); |