---

yaml --- r: 143485 b: refs/heads/master c: c19f836 h: refs/heads/master i: 143483: 4f287e1 v: v3
git-mirror · Apr 16, 2009 · 199495a · 199495a
1 parent 2e3d2ca
commit 199495a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3cf95dd6d352954b663d2934110d6e30af2406d
+refs/heads/master: c19f83669a02d4fa047d0d40f518e90f6f19c4c6
diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c
@@ -258,7 +258,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 			goto exit;
 
 		retval = call_usermodehelper(argv[0], argv,
-					     env->envp, UMH_NO_WAIT);
+					     env->envp, UMH_WAIT_EXEC);
 	}
 
 exit:

diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
@@ -1575,7 +1575,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
 	 * Overcommit..  This must be the final test, as it will
 	 * update security statistics.
 	 */
-	if (security_vm_enough_memory(grow))
+	if (security_vm_enough_memory_mm(mm, grow))
 		return -ENOMEM;
 
 	/* Ok, everything looks good - let it rip */