From e695e948aa7fbac6a59b3ec20be7e6455a1d09ff Mon Sep 17 00:00:00 2001
From: hongfeng <hongfeng@marvell.com>
Date: Thu, 4 Oct 2012 17:12:25 -0700
Subject: [PATCH] --- yaml --- r: 330061 b: refs/heads/master c:
 6c0c0d4d1080840eabb3d055d2fd81911111c5fd h: refs/heads/master i:   330059:
 cbd3bed3df836e49e1be32cb19f81b0412391c17 v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2c5ebe420d77..0bf967b208b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f96972f2dc6365421cf2366ebd61ee4cf060c8d5
+refs/heads/master: 6c0c0d4d1080840eabb3d055d2fd81911111c5fd
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index fdad206165d0..c5cb5b99cb81 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -2205,7 +2205,7 @@ static int __orderly_poweroff(void)
 		return -ENOMEM;
 	}
 
-	ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_NO_WAIT,
+	ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_WAIT_EXEC,
 				      NULL, argv_cleanup, NULL);
 	if (ret == -ENOMEM)
 		argv_free(argv);