Module Name: src
Committed By: martin
Date: Tue Apr 19 07:12:59 UTC 2011
Modified Files:
src/sys/kern: subr_percpu.c
Log Message:
Relax an assertion
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/subr_percpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_percpu.c
diff -u src/sys/kern/subr_percpu.c:1.11 src/sys/kern/subr_percpu.c:1.12
--- src/sys/kern/subr_percpu.c:1.11 Thu Apr 14 05:53:53 2011
+++ src/sys/kern/subr_percpu.c Tue Apr 19 07:12:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_percpu.c,v 1.11 2011/04/14 05:53:53 matt Exp $ */
+/* $NetBSD: subr_percpu.c,v 1.12 2011/04/19 07:12:59 martin Exp $ */
/*-
* Copyright (c)2007,2008 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.11 2011/04/14 05:53:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.12 2011/04/19 07:12:59 martin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -90,7 +90,7 @@
percpu_cpu_t * const newpcc = p2;
percpu_cpu_t * const pcc = cpu_percpu(ci);
- KASSERT(ci == curcpu());
+ KASSERT(ci == curcpu() || !mp_online);
/*
* swap *pcc and *newpcc unless anyone has beaten us.
