From owner-svn-src-stable@FreeBSD.ORG Sun Feb 8 22:13:55 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8C321065675; Sun, 8 Feb 2009 22:13:55 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from ey-out-2122.google.com (ey-out-2122.google.com [74.125.78.26]) by mx1.freebsd.org (Postfix) with ESMTP id 88F118FC20; Sun, 8 Feb 2009 22:13:54 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: by ey-out-2122.google.com with SMTP id d26so198732eyd.7 for ; Sun, 08 Feb 2009 14:13:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:cc:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:mime-version :subject:date:references:x-pgp-agent:x-mailer; bh=ylUBhBoUvp+dwbtYyiv+MpgKZHN2Syd8kuTSpwPCRbY=; b=f2HAfSM1OvCpW6JliGGjVMb0Atvb0RgcQYl9CHqt1J38J2EQSdUTD4/EnH4PivtWYv 9tXUHjgY+v23W29UpVR4P1iVvsqHGMrziNMWiBKGDwMClIAgGpcZXhNtVUHVHSA7QrDX XXExMmVRcE5Tm+ATN+pLAKbxj0noxL1qLV9/g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=cc:message-id:from:to:in-reply-to:content-type :content-transfer-encoding:mime-version:subject:date:references :x-pgp-agent:x-mailer; b=vZoF8ddkwaEmlV52xl0m88tzhPfAAXUDQVL8pKZF9eECSlBW9OyASCmsIyZ+hwcV2e UzU8MWPbrNnIOnHQACrziH6PXJ1u8vQ8tsYhcu0I4IjH56c8gGrZjPhDaxGZquDyoodx cPuitvFP5ua3eOz40SUJ9/0s8tIbRcGiPALKg= Received: by 10.210.119.16 with SMTP id r16mr849680ebc.91.1234131233532; Sun, 08 Feb 2009 14:13:53 -0800 (PST) Received: from epsilon.lan (bl9-153-17.dsl.telepac.pt [85.242.153.17]) by mx.google.com with ESMTPS id h7sm9379173nfh.27.2009.02.08.14.13.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 08 Feb 2009 14:13:52 -0800 (PST) Message-Id: <8F7136F6-15CC-4ACC-83AC-867900012717@gmail.com> From: Rui Paulo To: Rui Paulo In-Reply-To: <1F7BDEA8-EFB8-42D9-A32D-1D3F49F9C9EC@FreeBSD.org> Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Apple-Mail-4-273472754" Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Date: Sun, 8 Feb 2009 22:13:46 +0000 References: <200902082000.n18K0aBr032797@svn.freebsd.org> <498F3EA7.4050900@gmx.de> <1F7BDEA8-EFB8-42D9-A32D-1D3F49F9C9EC@FreeBSD.org> X-Pgp-Agent: GPGMail 1.2.0 (v56) X-Mailer: Apple Mail (2.930.3) Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Christoph Mallon , src-committers@freebsd.org Subject: Re: svn commit: r188326 - in stable/7/sys: . contrib/pf dev/acpi_support dev/cxgb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Feb 2009 22:13:56 -0000 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--