diff options
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index cebccb1b3e3..3ec76aebf79 100644 --- a/sys/arch/amd64/amd64/acpi_machdep.c +++ b/sys/arch/amd64/amd64/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.24 2009/11/22 22:00:25 pirofti Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.25 2009/11/23 16:21:54 pirofti Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -171,7 +171,6 @@ acpi_attach_machdep(struct acpi_softc *sc) IST_LEVEL, IPL_TTY, acpi_interrupt, sc, sc->sc_dev.dv_xname); cpuresetfn = acpi_reset; -#ifdef ACPI_SLEEP_ENABLED /* * Sanity check before setting up trampoline. * Ensure the trampoline size is < PAGE_SIZE @@ -182,7 +181,6 @@ acpi_attach_machdep(struct acpi_softc *sc) acpi_resume_end - acpi_real_mode_resume); acpi_pdirpa = tramp_pdirpa; -#endif /* ACPI_SLEEP_ENABLED */ } void @@ -198,7 +196,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); @@ -258,7 +255,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/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index d747347d756..8da63781347 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.101 2009/08/11 19:17:16 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.102 2009/11/23 16:21:54 pirofti Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1142,7 +1142,7 @@ cpu_init_extents(void) } #if defined(MULTIPROCESSOR) || \ - (NACPI > 0 && defined(ACPI_SLEEP_ENABLED) && !defined(SMALL_KERNEL)) + (NACPI > 0 && !defined(SMALL_KERNEL)) void map_tramps(void) { struct pmap *kmp = pmap_kernel(); @@ -1167,11 +1167,9 @@ map_tramps(void) { #endif /* MULTIPROCESSOR */ -#ifdef ACPI_SLEEP_ENABLED pmap_kenter_pa((vaddr_t)ACPI_TRAMPOLINE, /* virtual */ (paddr_t)ACPI_TRAMPOLINE, /* physical */ VM_PROT_ALL); /* protection */ -#endif /* ACPI_SLEEP_ENABLED */ } #endif @@ -1266,10 +1264,10 @@ init_x86_64(paddr_t first_avail) avail_start = MP_TRAMPOLINE + PAGE_SIZE; #endif -#ifdef ACPI_SLEEP_ENABLED +#ifndef SMALL_KERNEL if (avail_start < ACPI_TRAMPOLINE + PAGE_SIZE) avail_start = ACPI_TRAMPOLINE + PAGE_SIZE; -#endif /* ACPI_SLEEP_ENABLED */ +#endif /* !SMALL_KERNEL */ /* Let us know if we're supporting > 4GB ram load */ if (bigmem) @@ -1463,7 +1461,7 @@ init_x86_64(paddr_t first_avail) VM_PROT_READ|VM_PROT_WRITE); #if defined(MULTIPROCESSOR) || \ - (NACPI > 0 && defined(ACPI_SLEEP_ENABLED) && !defined(SMALL_KERNEL)) + (NACPI > 0 && !defined(SMALL_KERNEL)) map_tramps(); #endif |