diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-07-06 06:25:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-07-06 06:25:57 +0000 |
| commit | 0b365cd9940c9cf2eebb46aed1d65d9cee2d3324 (patch) | |
| tree | 8fb251c1441164571d5b03c0b81051160ad47979 /sys | |
| parent | 1455aae0fca9e5e25913a69d057beef39702ee2f (diff) | |
get rid of ridiculous differences between the i386 and amd64 versions
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index 063768c77ac..3beb4e5668f 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.39 2010/07/01 21:45:03 mlarkin Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.40 2010/07/06 06:25:56 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -235,7 +235,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) #ifdef MULTIPROCESSOR x86_broadcast_ipi(X86_IPI_SYNCH_FPU); x86_broadcast_ipi(X86_IPI_HALT); -#endif +#endif wbinvd(); acpi_enter_sleep_state(sc, state); panic("%s: acpi_enter_sleep_state failed", DEVNAME(sc)); @@ -274,7 +274,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) return (0); } -void cpu_start_secondary(struct cpu_info *ci); +void cpu_start_secondary(struct cpu_info *ci); void acpi_resume_machdep(void) @@ -298,7 +298,7 @@ acpi_resume_machdep(void) if (ci->ci_flags & (CPUF_BSP|CPUF_SP|CPUF_PRIMARY)) continue; KASSERT((ci->ci_flags & CPUF_RUNNING) == 0); - + p = ci->ci_schedstate.spc_idleproc; pcb = &p->p_addr->u_pcb; diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index 22faafe79a9..29cefc5a72b 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.33 2010/07/01 21:45:03 mlarkin Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.34 2010/07/06 06:25:55 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -57,7 +57,7 @@ #endif #if NAPM > 0 -int haveacpibutusingapm; +int haveacpibutusingapm; #endif extern u_char acpi_real_mode_resume[], acpi_resume_end[]; @@ -246,7 +246,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) /* Copy the current cpu registers into a safe place for resume. * acpi_savecpu actually returns twice - once in the suspend * path and once in the resume path (see setjmp(3)). - */ + */ if (acpi_savecpu()) { /* Suspend path */ npxsave_cpu(curcpu(), 1); @@ -264,7 +264,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) /* Temporarily disabled for debugging purposes */ /* Reset the wakeup vector to avoid resuming on reboot */ sc->sc_facs->wakeup_vector = 0; -#endif +#endif #if NISA > 0 isa_defaultirq(); @@ -331,5 +331,4 @@ acpi_resume_machdep(void) cpu_boot_secondary_processors(); #endif /* MULTIPROCESSOR */ } - #endif /* ! SMALL_KERNEL */ |