---

yaml --- r: 247950 b: refs/heads/master c: ae6b585 h: refs/heads/master v: v3
git-mirror · Apr 9, 2011 · 4e4db44 · 4e4db44
1 parent 331594d
commit 4e4db44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e028465d18b7c6797fcbdea632299d16097c5cd
+refs/heads/master: ae6b585eeb74670a2dec1fe4394bdfbdb9395cc2
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
@@ -167,7 +167,12 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
 }
 
 #ifdef CONFIG_MMU
-
+/*
+ * The nascent bprm->mm is not visible until exec_mmap() but it can
+ * use a lot of memory, account these pages in current->mm temporary
+ * for oom_badness()->get_mm_rss(). Once exec succeeds or fails, we
+ * change the counter back via acct_arg_size(0).
+ */
 static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
 {
 	struct mm_struct *mm = current->mm;