CVS commit: src/sys/dev/sysmon

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Tue Jun 23 10:41:42 UTC 2015

Modified Files:
        src/sys/dev/sysmon: sysmon_envsys_events.c

Log Message:
Fix the KASSERT - we want to make sure that _both_ pointers are non-NULL,
n ot just that one or the other is non-NULL!


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/sysmon/sysmon_envsys_events.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/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.115 src/sys/dev/sysmon/sysmon_envsys_events.c:1.116
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.115	Sat Apr 18 14:44:44 2015
+++ src/sys/dev/sysmon/sysmon_envsys_events.c	Tue Jun 23 10:41:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.115 2015/04/18 14:44:44 mlelstv Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.116 2015/06/23 10:41:41 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.115 2015/04/18 14:44:44 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.116 2015/06/23 10:41:41 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -768,7 +768,7 @@ sme_events_worker(struct work *wk, void 
 	envsys_data_t *edata = see->see_edata;
 
 	KASSERT(wk == &see->see_wk);
-	KASSERT(sme != NULL || edata != NULL);
+	KASSERT(sme != NULL && edata != NULL);
 
 	mutex_enter(&sme->sme_mtx);
 	see->see_flags |= SEE_EVENT_WORKING;