* [PATCH 04/15] i386: Handle HP laptop rebooting properly. @ 2006-01-04 21:59 Ben Collins 2006-01-04 22:42 ` Kyle McMartin 2006-01-05 8:50 ` Ulrich Mueller 0 siblings, 2 replies; 4+ messages in thread From: Ben Collins @ 2006-01-04 21:59 UTC (permalink / raw) To: linux-kernel 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly. 2006-01-04 21:59 [PATCH 04/15] i386: Handle HP laptop rebooting properly Ben Collins @ 2006-01-04 22:42 ` Kyle McMartin 2006-01-04 22:56 ` Ben Collins 2006-01-05 8:50 ` Ulrich Mueller 1 sibling, 1 reply; 4+ messages in thread From: Kyle McMartin @ 2006-01-04 22:42 UTC (permalink / raw) To: Ben Collins; +Cc: linux-kernel 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly. 2006-01-04 22:42 ` Kyle McMartin @ 2006-01-04 22:56 ` Ben Collins 0 siblings, 0 replies; 4+ messages in thread From: Ben Collins @ 2006-01-04 22:56 UTC (permalink / raw) To: Kyle McMartin; +Cc: Ben Collins, linux-kernel 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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly. 2006-01-04 21:59 [PATCH 04/15] i386: Handle HP laptop rebooting properly Ben Collins 2006-01-04 22:42 ` Kyle McMartin @ 2006-01-05 8:50 ` Ulrich Mueller 1 sibling, 0 replies; 4+ messages in thread From: Ulrich Mueller @ 2006-01-05 8:50 UTC (permalink / raw) To: Ben Collins; +Cc: linux-kernel >>>>> 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-01-05 8:50 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2006-01-04 21:59 [PATCH 04/15] i386: Handle HP laptop rebooting properly Ben Collins 2006-01-04 22:42 ` Kyle McMartin 2006-01-04 22:56 ` Ben Collins 2006-01-05 8:50 ` Ulrich Mueller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox