svn commit: r188326 - in stable/7/sys: . contrib/pf
dev/acpi_support dev/cxgb
Rui Paulo
rpaulo at gmail.com
Sun Feb 8 14:13:56 PST 2009
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 194 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/svn-src-stable-7/attachments/20090208/12db8ae6/PGP.pgp
More information about the svn-src-stable-7
mailing list