X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=kernel%2Fsys.c;h=e83ddbbaf89d1eb4fed500696c39aa0305ba106e;hb=62052be3a797f26f6f0fe30fc8d7f40ab54e08fd;hp=0d36d889c74d277799ae409f396a49c6d2c15415;hpb=ee9a3607fb03e804ddf624544105f4e34260c380;p=linux-2.6-block.git

diff --git a/kernel/sys.c b/kernel/sys.c
index 0d36d889c74d..e83ddbbaf89d 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1632,9 +1632,9 @@ SYSCALL_DEFINE3(getcpu, unsigned __user *, cpup, unsigned __user *, nodep,
 
 char poweroff_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/poweroff";
 
-static void argv_cleanup(char **argv, char **envp)
+static void argv_cleanup(struct subprocess_info *info)
 {
-	argv_free(argv);
+	argv_free(info->argv);
 }
 
 /**
@@ -1668,7 +1668,7 @@ int orderly_poweroff(bool force)
 		goto out;
 	}
 
-	call_usermodehelper_setcleanup(info, argv_cleanup);
+	call_usermodehelper_setfns(info, NULL, argv_cleanup, NULL);
 
 	ret = call_usermodehelper_exec(info, UMH_NO_WAIT);