diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /mm/nommu.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 2696b24f2bb3..7695dc850785 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -1454,7 +1454,8 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) | |||
| 1454 | 1454 | ||
| 1455 | /* Don't let a single process grow too big: | 1455 | /* Don't let a single process grow too big: |
| 1456 | leave 3% of the size of this process for other processes */ | 1456 | leave 3% of the size of this process for other processes */ |
| 1457 | allowed -= current->mm->total_vm / 32; | 1457 | if (mm) |
| 1458 | allowed -= mm->total_vm / 32; | ||
| 1458 | 1459 | ||
| 1459 | /* | 1460 | /* |
| 1460 | * cast `allowed' as a signed long because vm_committed_space | 1461 | * cast `allowed' as a signed long because vm_committed_space |