diff options
| author | Alan Cox | 2008-05-23 22:04:31 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-05-24 18:56:09 +0200 |
| commit | 80119ef5c8153e0a6cc5edf00c083dc98a9bd348 (patch) | |
| tree | a2af11a3991b1bebe9d764ab6d4d28891e86eda2 /mm/nommu.c | |
| parent | types.h: don't expose struct ustat to userspace (diff) | |
| download | kernel-qcow2-linux-80119ef5c8153e0a6cc5edf00c083dc98a9bd348.tar.gz kernel-qcow2-linux-80119ef5c8153e0a6cc5edf00c083dc98a9bd348.tar.xz kernel-qcow2-linux-80119ef5c8153e0a6cc5edf00c083dc98a9bd348.zip | |
mm: fix atomic_t overflow in vm
The atomic_t type is 32bit but a 64bit system can have more than 2^32
pages of virtual address space available. Without this we overflow on
ludicrously large mappings
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index ef8c62cec697..dca93fcb8b7a 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -39,7 +39,7 @@ struct page *mem_map; unsigned long max_mapnr; unsigned long num_physpages; unsigned long askedalloc, realalloc; -atomic_t vm_committed_space = ATOMIC_INIT(0); +atomic_long_t vm_committed_space = ATOMIC_LONG_INIT(0); int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; @@ -1410,7 +1410,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) * cast `allowed' as a signed long because vm_committed_space * sometimes has a negative value */ - if (atomic_read(&vm_committed_space) < (long)allowed) + if (atomic_long_read(&vm_committed_space) < (long)allowed) return 0; error: vm_unacct_memory(pages); |