From 3d11d69fe7cd386923ba3ef27c5f69e938111ff6 Mon Sep 17 00:00:00 2001 From: Mike Larkin Date: Sat, 26 Jun 2010 15:56:41 +0000 Subject: Don't try to halt an AP if holding sched_lock since that causes hangs on resume. Fail early if this is detected, so that we have a chance to catch it. ok kettenis@, deraadt@ --- sys/arch/i386/i386/ipifuncs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sys/arch/i386') diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c index 76c4df59186..3d2dcf64916 100644 --- a/sys/arch/i386/i386/ipifuncs.c +++ b/sys/arch/i386/i386/ipifuncs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipifuncs.c,v 1.16 2010/04/07 06:33:06 kettenis Exp $ */ +/* $OpenBSD: ipifuncs.c,v 1.17 2010/06/26 15:56:40 mlarkin Exp $ */ /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */ /*- @@ -100,6 +100,7 @@ i386_ipi_nop(struct cpu_info *ci) void i386_ipi_halt(struct cpu_info *ci) { + SCHED_ASSERT_UNLOCKED(); disable_intr(); ci->ci_flags &= ~CPUF_RUNNING; wbinvd(); -- cgit v1.2.3