From: deraadt <deraadt@openbsd.org>
Date: Sat, 17 Jan 2015 04:18:49 +0000 (+0000)
Subject: resume_randomness() before spinning up other cpus...
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d9f2dcb126161959adf2899751ce99b5423d4302;p=openbsd

resume_randomness() before spinning up other cpus...
---

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 28e0e2ac186..b3d3e4ac46e 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.280 2015/01/15 01:19:28 jsg Exp $ */
+/* $OpenBSD: acpi.c,v 1.281 2015/01/17 04:18:49 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -2274,11 +2274,12 @@ fail_suspend:
 	/* 3rd resume AML step: _TTS(runstate) */
 	aml_node_setval(sc, sc->sc_tts, sc->sc_state);
 
+	resume_randomness();		/* force RNG upper level reseed */
+
 #ifdef MULTIPROCESSOR
 	acpi_resume_mp();
 #endif
 
-	resume_randomness();		/* force RNG upper level reseed */
 	bufq_restart();
 
 fail_quiesce: