From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments.patch removed from -mm tree Date: Mon, 07 Jan 2008 13:39:27 -0800 Message-ID: <200801072139.m07Ld7dU013541@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:46638 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757196AbYAGVjf (ORCPT ); Mon, 7 Jan 2008 16:39:35 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: viro@ftp.linux.org.uk, jdike@addtoit.com, viro@zeniv.linux.org.uk, mm-commits@vger.kernel.org The patch titled uml: user of helper_wait() got missed when it got extra arguments has been removed from the -mm tree. Its filename was uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: uml: user of helper_wait() got missed when it got extra arguments From: Al Viro Signed-off-by: Al Viro Cc: Jeff Dike Signed-off-by: Andrew Morton --- arch/um/drivers/harddog_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/um/drivers/harddog_user.c~uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments arch/um/drivers/harddog_user.c --- a/arch/um/drivers/harddog_user.c~uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments +++ a/arch/um/drivers/harddog_user.c @@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int * n = read(in_fds[0], &c, sizeof(c)); if (n == 0) { printk("harddog_open - EOF on watchdog pipe\n"); - helper_wait(pid); + helper_wait(pid, 1, NULL); err = -EIO; goto out_close_out; } else if (n < 0) { printk("harddog_open - read of watchdog pipe failed, " "err = %d\n", errno); - helper_wait(pid); + helper_wait(pid, 1, NULL); err = n; goto out_close_out; } _ Patches currently in -mm which might be from viro@ftp.linux.org.uk are sdio-fix-module-device-table-definition-for-m68k.patch git-netdev-all.patch slab-leaks3-default-y.patch