diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2009-11-23 16:21:55 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2009-11-23 16:21:55 +0000 |
| commit | ecb04f492b9be2bc502a476317e1bb7eead1a01e (patch) | |
| tree | 855d514d3722afb3b72f4f2afa3bac0beaff2416 /sys/dev | |
| parent | f25c0075c80ece366422bade164e10046df5f931 (diff) | |
Remove ACPI_SLEEP_ENABLED checks.
This enables by default the suspend/resume paths in the kernel.
Okay deraadt@.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 8 | ||||
| -rw-r--r-- | sys/dev/acpi/acpibtn.c | 6 | ||||
| -rw-r--r-- | sys/dev/acpi/acpivar.h | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index c0b16cc0522..89f12fef1c3 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.145 2009/11/23 15:18:05 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.146 2009/11/23 16:21:54 pirofti Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -954,7 +954,6 @@ acpiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) ACPI_LOCK(sc); /* fake APM */ switch (cmd) { -#ifdef ACPI_SLEEP_ENABLED case APM_IOC_STANDBY_REQ: case APM_IOC_SUSPEND_REQ: case APM_IOC_SUSPEND: @@ -962,7 +961,6 @@ acpiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) workq_add_task(NULL, 0, (workq_fn)acpi_sleep_state, acpi_softc, (void *)ACPI_STATE_S3); break; -#endif /* ACPI_SLEEP_ENABLED */ case APM_IOC_GETPOWER: /* A/C */ pi->ac_state = APM_AC_UNKNOWN; @@ -1841,10 +1839,10 @@ acpi_sleep_state(struct acpi_softc *sc, int state) else ret = acpi_enter_sleep_state(sc, state); -#ifdef ACPI_SLEEP_ENABLED +#ifndef SMALL_KERNEL if (state == ACPI_STATE_S3) acpi_resume(sc, state); -#endif /* ACPI_SLEEP_ENABLED */ +#endif /* !SMALL_KERNEL */ return (ret); } diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c index 9c25a575026..485b875500a 100644 --- a/sys/dev/acpi/acpibtn.c +++ b/sys/dev/acpi/acpibtn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpibtn.c,v 1.21 2009/02/19 21:02:05 marco Exp $ */ +/* $OpenBSD: acpibtn.c,v 1.22 2009/11/23 16:21:54 pirofti Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -122,9 +122,9 @@ acpibtn_notify(struct aml_node *node, int notify_type, void *arg) switch (sc->sc_btn_type) { case ACPIBTN_LID: case ACPIBTN_SLEEP: -#ifdef ACPI_SLEEP_ENABLED +#ifndef SMALL_KERNEL acpi_sleep_state(sc->sc_acpi, ACPI_STATE_S3); -#endif /* ACPI_SLEEP_ENABLED */ +#endif /* SMALL_KERNEL */ break; case ACPIBTN_POWER: if (notify_type == 0x80) diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h index 3528e233cb5..83fe5991adc 100644 --- a/sys/dev/acpi/acpivar.h +++ b/sys/dev/acpi/acpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivar.h,v 1.53 2009/11/23 15:08:02 mlarkin Exp $ */ +/* $OpenBSD: acpivar.h,v 1.54 2009/11/23 16:21:54 pirofti Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -36,8 +36,6 @@ extern int acpi_debug; #define dnprintf(n,x...) #endif -/* #define ACPI_SLEEP_ENABLED */ - extern int acpi_hasprocfvs; #define LAPIC_MAP_SIZE 256 |