From owner-svn-src-all@FreeBSD.ORG  Wed Jun 10 17:30:13 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 471971065674;
	Wed, 10 Jun 2009 17:30:13 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 342CD8FC14;
	Wed, 10 Jun 2009 17:30:13 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AHUDw0020610;
	Wed, 10 Jun 2009 17:30:13 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AHUDhO020609;
	Wed, 10 Jun 2009 17:30:13 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906101730.n5AHUDhO020609@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 10 Jun 2009 17:30:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193933 - in stable/7/usr.sbin/acpi: . acpidump
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 17:30:14 -0000

Author: des
Date: Wed Jun 10 17:30:12 2009
New Revision: 193933
URL: http://svn.freebsd.org/changeset/base/193933

Log:
  merge r173723, r173726: fix an execl() call.

Modified:
  stable/7/usr.sbin/acpi/   (props changed)
  stable/7/usr.sbin/acpi/acpidump/acpi.c

Modified: stable/7/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- stable/7/usr.sbin/acpi/acpidump/acpi.c	Wed Jun 10 17:29:13 2009	(r193932)
+++ stable/7/usr.sbin/acpi/acpidump/acpi.c	Wed Jun 10 17:30:12 2009	(r193933)
@@ -821,7 +821,7 @@ aml_disassemble(struct ACPIsdt *rsdt, st
 		close(STDOUT_FILENO);
 		if (vflag == 0)
 			close(STDERR_FILENO);
-		execl("/usr/sbin/iasl", "iasl", "-d", tmpstr, 0);
+		execl("/usr/sbin/iasl", "iasl", "-d", tmpstr, (char *) 0);
 		err(1, "exec");
 	}