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/arch/i386 | |
| 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/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index c50210dc896..1e782f359a4 100644 --- a/sys/arch/i386/i386/acpi_machdep.c +++ b/sys/arch/i386/i386/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.23 2009/08/13 15:33:20 kettenis Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.24 2009/11/23 16:21:54 pirofti Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -191,7 +191,6 @@ acpi_attach_machdep(struct acpi_softc *sc) acpiapm_kqfilter = acpikqfilter; cpuresetfn = acpi_reset; -#ifdef ACPI_SLEEP_ENABLED /* * Sanity check before setting up trampoline. * Ensure the trampoline size is < PAGE_SIZE @@ -200,7 +199,6 @@ acpi_attach_machdep(struct acpi_softc *sc) bcopy(acpi_real_mode_resume, (caddr_t)ACPI_TRAMPOLINE, acpi_resume_end - acpi_real_mode_resume); -#endif /* ACPI_SLEEP_ENABLED */ } void @@ -216,7 +214,6 @@ acpi_cpu_flush(struct acpi_softc *sc, int state) int acpi_sleep_machdep(struct acpi_softc *sc, int state) { -#ifdef ACPI_SLEEP_ENABLED if (sc->sc_facs == NULL) { printf("%s: acpi_sleep_machdep: no FACS\n", DEVNAME(sc)); return (ENXIO); @@ -278,7 +275,6 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) #endif initrtclock(); inittodr(time_second); -#endif /* ACPI_SLEEP_ENABLED */ return (0); } diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 2b7d97121c1..c67b1513fb3 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.464 2009/11/18 18:16:46 jsg Exp $ */ +/* $OpenBSD: machdep.c,v 1.465 2009/11/23 16:21:54 pirofti Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -3097,7 +3097,7 @@ init386(paddr_t first_avail) #endif #if defined(MULTIPROCESSOR) || \ - (NACPI > 0 && defined(ACPI_SLEEP_ENABLED) && !defined(SMALL_KERNEL)) + (NACPI > 0 && !defined(SMALL_KERNEL)) /* install the lowmem ptp after boot args for 1:1 mappings */ pmap_prealloc_lowmem_ptp(PTP0_PA); #endif @@ -3108,7 +3108,7 @@ init386(paddr_t first_avail) VM_PROT_ALL); /* protection */ #endif -#if NACPI > 0 && defined(ACPI_SLEEP_ENABLED) && !defined(SMALL_KERNEL) +#if NACPI > 0 && !defined(SMALL_KERNEL) pmap_kenter_pa((vaddr_t)ACPI_TRAMPOLINE,/* virtual */ (paddr_t)ACPI_TRAMPOLINE, /* physical */ VM_PROT_ALL); /* protection */ |