Module Name: src Committed By: matt Date: Thu Apr 14 05:53:53 UTC 2011
Modified Files: src/sys/kern: subr_percpu.c Log Message: Add a KASSERT To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 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.10 src/sys/kern/subr_percpu.c:1.11 --- src/sys/kern/subr_percpu.c:1.10 Wed Oct 21 21:12:06 2009 +++ src/sys/kern/subr_percpu.c Thu Apr 14 05:53:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_percpu.c,v 1.10 2009/10/21 21:12:06 rmind Exp $ */ +/* $NetBSD: subr_percpu.c,v 1.11 2011/04/14 05:53:53 matt Exp $ */ /*- * Copyright (c)2007,2008 YAMAMOTO Takashi, @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.10 2009/10/21 21:12:06 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.11 2011/04/14 05:53:53 matt Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -90,10 +90,11 @@ percpu_cpu_t * const newpcc = p2; percpu_cpu_t * const pcc = cpu_percpu(ci); + KASSERT(ci == curcpu()); + /* * swap *pcc and *newpcc unless anyone has beaten us. */ - rw_enter(&percpu_swap_lock, RW_WRITER); if (newpcc->pcc_size > pcc->pcc_size) { percpu_cpu_t tmp;