[PATCH 04/15] i386: Handle HP laptop rebooting properly.

[PATCH 04/15] i386: Handle HP laptop rebooting properly.

[Ben Collins]

Signed-off-by: Ben Collins <bcollins@ubuntu.com>

---

 arch/i386/kernel/reboot.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

2e513fcd2a64eae5d7d9937ca253760d249d10a5
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 2afe0f8..cba9057 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -111,6 +111,14 @@ static struct dmi_system_id __initdata r
 			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
 		},
 	},
+	{	/* HP laptops have weird reboot issues */
+		.callback = set_bios_reboot,
+		.ident = "HP Laptop",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
+		},
+	},
 	{	/* Handle problems with rebooting on HP nc6120 */
 		.callback = set_bios_reboot,
 		.ident = "HP Compaq nc6120",
-- 
1.0.5

Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly.

[Kyle McMartin]

On Wed, Jan 04, 2006 at 04:59:44PM -0500, Ben Collins wrote:
> +	{	/* HP laptops have weird reboot issues */
> +		.callback = set_bios_reboot,
> +		.ident = "HP Laptop",
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
> +		},
> +	},
>  	{	/* Handle problems with rebooting on HP nc6120 */
>  		.callback = set_bios_reboot,
>  		.ident = "HP Compaq nc6120",
>

Looks like the entry below could be removed, as it's now covered by
the above.

Cheers,
	Kyle 

Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly.

[Ben Collins]

On Wed, 2006-01-04 at 17:42 -0500, Kyle McMartin wrote:
> On Wed, Jan 04, 2006 at 04:59:44PM -0500, Ben Collins wrote:
> > +	{	/* HP laptops have weird reboot issues */
> > +		.callback = set_bios_reboot,
> > +		.ident = "HP Laptop",
> > +		.matches = {
> > +			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> > +			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
> > +		},
> > +	},
> >  	{	/* Handle problems with rebooting on HP nc6120 */
> >  		.callback = set_bios_reboot,
> >  		.ident = "HP Compaq nc6120",
> >
> 
> Looks like the entry below could be removed, as it's now covered by
> the above.

That's correct, so here's a better trivial patch to just broaden the
existing entry.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>

diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 2afe0f8..2fa5803 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -111,12 +111,12 @@ static struct dmi_system_id __initdata r
 			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
 		},
 	},
-	{	/* Handle problems with rebooting on HP nc6120 */
+	{	/* Handle problems with rebooting on HP laptops */
 		.callback = set_bios_reboot,
-		.ident = "HP Compaq nc6120",
+		.ident = "HP Compaq Laptop",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6120"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
 		},
 	},
 	{ }


-- 
   Ben Collins <ben.collins@ubuntu.com>
   Developer
   Ubuntu Linux

Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly.

[Ulrich Mueller]

>>>>> On Wed, 04 Jan 2006, Ben Collins wrote:

> --- a/arch/i386/kernel/reboot.c
> +++ b/arch/i386/kernel/reboot.c
> @@ -111,6 +111,14 @@ static struct dmi_system_id __initdata r
>  			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
>  		},
>  	},
> +	{	/* HP laptops have weird reboot issues */
> +		.callback = set_bios_reboot,
> +		.ident = "HP Laptop",
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
> +		},
> +	},
>  	{	/* Handle problems with rebooting on HP nc6120 */
>  		.callback = set_bios_reboot,
>  		.ident = "HP Compaq nc6120",

An essentially identical patch is already included in 2.6.15-rc5-mm3:
reboot-through-the-bios-on-newer-hp-laptops.patch