On Wed, Oct 08, 2014 at 01:30:38AM -0600, David Coppa wrote: > > Hi! > > When running a kernel built without "option HIBERNATE", if I press > the hibernate button (Fn+F12) on my ThinkPad T420, the system > abruptly shuts down and I'm welcomed by fsck on the next boot. > > What about the following diff? > > Index: dev/acpi/acpithinkpad.c > =================================================================== > RCS file: /cvs/src/sys/dev/acpi/acpithinkpad.c,v > retrieving revision 1.40 > diff -u -p -u -p -r1.40 acpithinkpad.c > --- dev/acpi/acpithinkpad.c 7 Oct 2014 11:28:59 -0000 1.40 > +++ dev/acpi/acpithinkpad.c 8 Oct 2014 07:14:06 -0000 > @@ -345,7 +345,7 @@ thinkpad_hotkey(struct aml_node *node, i > handled = 1; > break; > case THINKPAD_BUTTON_HIBERNATE: > -#ifndef SMALL_KERNEL > +#if defined(HIBERNATE) && !defined(SMALL_KERNEL) > acpi_addtask(sc->sc_acpi, acpi_sleep_task, > sc->sc_acpi, ACPI_STATE_S4); > #endif
Funny, I thought to myself yesterday "that doesn't look right" when looking through acpithinkpad.c for something else and saw that very same line. Looks fine to me, go ahead. -ml
