From 199495a74b835ac52aa83ad707fe5747a2d14ecd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 16 Apr 2009 14:42:04 -0700 Subject: [PATCH] --- yaml --- r: 143485 b: refs/heads/master c: c19f83669a02d4fa047d0d40f518e90f6f19c4c6 h: refs/heads/master i: 143483: 4f287e1c530022268e521d85ebb78ab13160a038 v: v3 --- [refs] | 2 +- trunk/lib/kobject_uevent.c | 2 +- trunk/mm/mmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 586bd34dbb37..85574ffc81fe 100644 --- 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 index 97a777ad4f59..dafeecf5b143 100644 --- 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 index 4a3841186c11..3303d1ba8e87 100644 --- 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 */