diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-11-24 16:12:37 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-11-24 16:12:37 +0000 |
| commit | 513569d7d2d9836b53c698a88c82f5f8086b3b59 (patch) | |
| tree | 0e335206ddc815c9cbf8ab1e427b247f93d1f3ee | |
| parent | Thoroughly reset the chip upon suspend and give the PHY a chance to (diff) | |
| download | wireguard-openbsd-513569d7d2d9836b53c698a88c82f5f8086b3b59.tar.xz wireguard-openbsd-513569d7d2d9836b53c698a88c82f5f8086b3b59.zip | |
abort suspends on SMP systems until that gets written; ok mlarkin
| -rw-r--r-- | sys/dev/acpi/acpi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 211cd3fbf50..7bcc3679743 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.148 2009/11/23 22:34:23 mlarkin Exp $ */ +/* $OpenBSD: acpi.c,v 1.149 2009/11/24 16:12:37 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -1818,6 +1818,10 @@ acpi_sleep_state(struct acpi_softc *sc, int state) { int ret; +#ifdef MULTIPROCESSOR + if (ncpus > 1) /* cannot suspend MP yet */ + return (0); +#endif switch (state) { case ACPI_STATE_S0: return (0); |