Date: Sun, 8 Feb 2009 22:13:46 +0000 From: Rui Paulo <rpaulo@gmail.com> To: Rui Paulo <rpaulo@FreeBSD.org> Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Christoph Mallon <christoph.mallon@gmx.de>, src-committers@freebsd.org Subject: Re: svn commit: r188326 - in stable/7/sys: . contrib/pf dev/acpi_support dev/cxgb Message-ID: <8F7136F6-15CC-4ACC-83AC-867900012717@gmail.com> In-Reply-To: <1F7BDEA8-EFB8-42D9-A32D-1D3F49F9C9EC@FreeBSD.org> References: <200902082000.n18K0aBr032797@svn.freebsd.org> <498F3EA7.4050900@gmx.de> <1F7BDEA8-EFB8-42D9-A32D-1D3F49F9C9EC@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --Apple-Mail-4-273472754 Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit On 8 Feb 2009, at 20:32, Rui Paulo wrote: > > 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. Should be fixed now. Thanks, -- Rui Paulo --Apple-Mail-4-273472754 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) iEYEARECAAYFAkmPWRoACgkQfD8M/ASTygL2zgCfQxT2wmclxtXGnW4ZHHY2dnmh 3NgAn3UzAwwex6KcGxhaBbVe+W62yG29 =gwqd -----END PGP SIGNATURE----- --Apple-Mail-4-273472754--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8F7136F6-15CC-4ACC-83AC-867900012717>