From 41f99e259a5b4bc9ba9c3f83aa4429db4797fd27 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 24 Nov 2009 16:12:38 +0000 Subject: abort suspends on SMP systems until that gets written; ok mlarkin --- sys/dev/acpi/acpi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sys') 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 * Copyright (c) 2005 Jordan Hargrave @@ -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); -- cgit v1.2.3