Skip to contentSkip to conversation

i386: Handle HP laptop rebooting properly.

PATCH In review Ben Collins 4 participants 4 messages Jan 4, 2006 – Jan 5, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 4/15 i386: Handle HP laptop rebooting properly.

---

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

2e513fcd2a64eae5d7d9937ca253760d249d10a5

arch/i386/kernel/reboot.c +8 -0
index 2afe0f8..cba9057 100644
@@ -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",
Signature · 1 line
1.0.5
#1 lore raw

arch/i386/kernel/reboot.c static struct dmi_system_id __initdata r · line 124

Quoted 12 lines · Ben Collins
arch/i386/kernel/reboot.c +8 -0
+	{	/* 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

#2 lore raw
Quoted 16 lines · Kyle McMartin

Review

Quoted 12 lines · Ben Collins
(quoted diff) +8 -0
+	{	/* 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.

arch/i386/kernel/reboot.c +3 -3
index 2afe0f8..2fa5803 100644
@@ -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"),
 		},
 	},
 	{ }
Signature · 3 lines
   Ben Collins <[email protected]>
   Developer
   Ubuntu Linux
#3 lore raw
In reply to Ben Collins
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · Ben Collins
arch/i386/kernel/reboot.c +1 -0
@@ -111,6 +111,14 @@ static struct dmi_system_id __initdata r
 			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
 		},
 	},
+	{	/* HP laptops have weird reboot issues */

arch/i386/kernel/reboot.c static struct dmi_system_id __initdata r · line 124

Quoted 10 lines
arch/i386/kernel/reboot.c +7 -0
+		.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