From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 8 20:54:43 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76F411065673 for ; Sun, 8 Feb 2009 20:54:43 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from mail-bw0-f163.google.com (mail-bw0-f163.google.com [209.85.218.163]) by mx1.freebsd.org (Postfix) with ESMTP id BA9C08FC14 for ; Sun, 8 Feb 2009 20:54:42 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: by bwz7 with SMTP id 7so827942bwz.19 for ; Sun, 08 Feb 2009 12:54:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:cc:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:mime-version :subject:date:references:x-pgp-agent:x-mailer; bh=e//Ehp7HHRdETTg63a8m7McNpAm+c/hd7Q9zYBKF3zw=; b=Ui2T0icSYSOECUcsdTjSUAQiPTPYXtfWdjQQCNe4ldbwQvO9NwAWSn7PlxuU+kY9h7 zpcOc33b46qt8OAgi2h9nRxlrw4MM11i52QD4jZ8r6aSeWriQjx3AMOCYeZtIMZY3Xvt ZKfW5LnR4gpdwXiSpaOYhkksn9f2oFJO1Ibsc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:cc:message-id:from:to:in-reply-to:content-type :content-transfer-encoding:mime-version:subject:date:references :x-pgp-agent:x-mailer; b=LunGx8gxPL21aXL0cKGZsw8tCvumRGmNNkD7tKJUWuyFH5oR9mJDnZVrvbYCNGW+qn Mm9r/WP2vyyh+sdhaSG7tFgOikthjBzCzTTmCCMQuob6CFBixtV3fi9U/7sQNVBd0kDd SGz0JVISiwCzHJq0f5ZmHbws3omM1wt7lwBiU= Received: by 10.223.110.3 with SMTP id l3mr1543475fap.48.1234125144092; Sun, 08 Feb 2009 12:32:24 -0800 (PST) Received: from epsilon.lan (bl9-153-17.dsl.telepac.pt [85.242.153.17]) by mx.google.com with ESMTPS id k9sm8846810nfh.17.2009.02.08.12.32.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 08 Feb 2009 12:32:23 -0800 (PST) Sender: Rui Paulo Message-Id: <1F7BDEA8-EFB8-42D9-A32D-1D3F49F9C9EC@FreeBSD.org> From: Rui Paulo To: Christoph Mallon In-Reply-To: <498F3EA7.4050900@gmx.de> Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Apple-Mail-3-267380729" Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Date: Sun, 8 Feb 2009 20:32:14 +0000 References: <200902082000.n18K0aBr032797@svn.freebsd.org> <498F3EA7.4050900@gmx.de> X-Pgp-Agent: GPGMail 1.2.0 (v56) X-Mailer: Apple Mail (2.930.3) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r188326 - in stable/7/sys: . contrib/pf dev/acpi_support dev/cxgb X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Feb 2009 20:54:44 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --Apple-Mail-3-267380729 Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit On 8 Feb 2009, at 20:20, Christoph Mallon wrote: > Rui Paulo schrieb: >> Author: rpaulo >> Date: Sun Feb 8 20:00:36 2009 >> New Revision: 188326 >> URL: http://svn.freebsd.org/changeset/base/188326 >> Log: >> MFC r186529 (stas): >> - Fix incorrect array declaration that was causing the stack >> overflow >> on some (most?) Asus laptops. >> Modified: >> stable/7/sys/ (props changed) >> stable/7/sys/contrib/pf/ (props changed) >> stable/7/sys/dev/acpi_support/acpi_asus.c >> stable/7/sys/dev/cxgb/ (props changed) >> Modified: stable/7/sys/dev/acpi_support/acpi_asus.c >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- stable/7/sys/dev/acpi_support/acpi_asus.c Sun Feb 8 20:00:33 >> 2009 (r188325) >> +++ stable/7/sys/dev/acpi_support/acpi_asus.c Sun Feb 8 20:00:36 >> 2009 (r188326) >> @@ -958,7 +958,9 @@ acpi_asus_sysctl_get(struct acpi_asus_so >> static int >> acpi_asus_sysctl_set(struct acpi_asus_softc *sc, int method, int arg) >> { >> - ACPI_STATUS status = AE_OK; >> + ACPI_STATUS status = AE_OK; >> + ACPI_OBJECT_LIST acpiargs; >> + ACPI_OBJECT acpiarg[1]; >> ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); >> ACPI_SERIAL_ASSERT(asus); > > r186529 does not seem to apply to 7.x, because you just added two > unused variables. Maybe you forgot to MFC something else (r180268?) > first. This is a merge botch... Sorry. -- Rui Paulo --Apple-Mail-3-267380729 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Darwin) iEYEARECAAYFAkmPQU4ACgkQfD8M/ASTygJxegCgqgPS9pu3OEOKkRFPCyY1ouZh eTcAmQFilkgGhjltEF7l4Rz6lONzJUb1 =tTxR -----END PGP SIGNATURE----- --Apple-Mail-3-267380729--