Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern The field ci_curlwp is only defined for MULTIPROCES...



details:   https://anonhg.NetBSD.org/src/rev/9cdd72e88209
branches:  trunk
changeset: 781375:9cdd72e88209
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Sep 02 16:00:00 2012 +0000

description:
The field ci_curlwp is only defined for MULTIPROCESSOR kernels.

diffstat:

 sys/kern/kern_synch.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r a6790d71a71b -r 9cdd72e88209 sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c     Sun Sep 02 14:46:38 2012 +0000
+++ b/sys/kern/kern_synch.c     Sun Sep 02 16:00:00 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_synch.c,v 1.304 2012/08/30 02:26:38 matt Exp $    */
+/*     $NetBSD: kern_synch.c,v 1.305 2012/09/02 16:00:00 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.304 2012/08/30 02:26:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.305 2012/09/02 16:00:00 mlelstv Exp $");
 
 #include "opt_kstack.h"
 #include "opt_perfctrs.h"
@@ -713,11 +713,15 @@
                }
 
                /* Switch to the new LWP.. */
+#ifdef MULTIPROCESSOR
                KASSERT(curlwp == ci->ci_curlwp);
+#endif
                KASSERTMSG(l == curlwp, "l %p curlwp %p", l, curlwp);
                prevlwp = cpu_switchto(l, newl, returning);
                ci = curcpu();
+#ifdef MULTIPROCESSOR
                KASSERT(curlwp == ci->ci_curlwp);
+#endif
                KASSERTMSG(l == curlwp, "l %p curlwp %p prevlwp %p",
                    l, curlwp, prevlwp);
 



Home | Main Index | Thread Index | Old Index