Re: 2.6.12-rc6-mm1

[Andrey Panin <pazke@donpac.ru>]

On 159, 06 08, 2005 at 03:22:57 +0100, Andy Whitcroft wrote:
> We've been seeing an early boot hang on IBM x-series (at least on an
> x440) with -rc6-mm1.  Finally got hold of a box to go search for this
> and it seems that backing out the three patches below fixes it.
> 
>  515  dmi-move-acpi-boot-quirk.patch
>  516  dmi-move-acpi-sleep-quirk.patch
>  517  dmi-remove-central-blacklist.patch
> 
> I am pretty sure it is actually the first one (thats where my bisection
> search pointed) but I had to drop the other two to back it out.  Anyhow,
> 2.6.12-rc6-mm1 boots on an x440 with these backed out.

Yeah, probably brown paper bag time... Please try the attached patch.

-- 
Andrey Panin		| Linux and UNIX system administrator
pazke@donpac.ru		| PGP key: wwwkeys.pgp.net

diff -urdpNX /usr/share/dontdiff linux-2.6.12-rc6-mm1.vanilla/arch/i386/kernel/acpi/boot.c linux-2.6.12-rc6-mm1/arch/i386/kernel/acpi/boot.c
--- linux-2.6.12-rc6-mm1.vanilla/arch/i386/kernel/acpi/boot.c	2005-06-09 08:02:06.000000000 +0400
+++ linux-2.6.12-rc6-mm1/arch/i386/kernel/acpi/boot.c	2005-06-09 08:24:01.000000000 +0400
@@ -1040,6 +1040,7 @@ static struct dmi_system_id __initdata a
 		},
 	},
 #endif
+	{ }
 };
 
 #endif	/* __i386__ */
diff -urdpNX /usr/share/dontdiff linux-2.6.12-rc6-mm1.vanilla/arch/i386/kernel/acpi/sleep.c linux-2.6.12-rc6-mm1/arch/i386/kernel/acpi/sleep.c
--- linux-2.6.12-rc6-mm1.vanilla/arch/i386/kernel/acpi/sleep.c	2005-06-09 08:02:06.000000000 +0400
+++ linux-2.6.12-rc6-mm1/arch/i386/kernel/acpi/sleep.c	2005-06-09 08:24:15.000000000 +0400
@@ -108,6 +108,7 @@ static __initdata struct dmi_system_id a
 			DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
 		},
 	},
+	{ }
 };
 
 static int __init acpisleep_dmi_init(void)

Attachment: signature.asc
Description: Digital signature