Module Name: src
Committed By: cliff
Date: Thu Feb 3 02:39:47 UTC 2011
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_softint.c syscall.c
Log Message:
fix KASSERTMSG useage
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.37.12.13 -r1.37.12.14 src/sys/arch/mips/mips/syscall.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/arch/mips/mips/mips_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.1.2.6 src/sys/arch/mips/mips/mips_softint.c:1.1.2.7
--- src/sys/arch/mips/mips/mips_softint.c:1.1.2.6 Mon Feb 22 20:17:09 2010
+++ src/sys/arch/mips/mips/mips_softint.c Thu Feb 3 02:39:46 2011
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.1.2.6 2010/02/22 20:17:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.1.2.7 2011/02/03 02:39:46 cliff Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -104,7 +104,7 @@
softint_fast_dispatch(ci->ci_softlwps[SOFTINT_##level], \
IPL_SOFT##level); \
KASSERT(ci->ci_softlwps[SOFTINT_##level]->l_ctxswtch == 0); \
- KASSERTMSG(ci->ci_cpl != IPL_HIGH, ("cpl (%d) != HIGH", ci->ci_cpl)); \
+ KASSERTMSG(ci->ci_cpl == IPL_HIGH, ("cpl (%d) != HIGH", ci->ci_cpl)); \
continue; \
}
Index: src/sys/arch/mips/mips/syscall.c
diff -u src/sys/arch/mips/mips/syscall.c:1.37.12.13 src/sys/arch/mips/mips/syscall.c:1.37.12.14
--- src/sys/arch/mips/mips/syscall.c:1.37.12.13 Wed Dec 29 00:47:50 2010
+++ src/sys/arch/mips/mips/syscall.c Thu Feb 3 02:39:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.37.12.13 2010/12/29 00:47:50 matt Exp $ */
+/* $NetBSD: syscall.c,v 1.37.12.14 2011/02/03 02:39:46 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.13 2010/12/29 00:47:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.14 2011/02/03 02:39:46 cliff Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sa.h"
@@ -175,7 +175,7 @@
int code, error;
#if defined(__mips_o32)
const int abi = _MIPS_BSD_API_O32;
- KASSERTMSG(p->p_md.md_abi != abi, ("pid %d(%p): md_abi(%d) != abi(%d)", p->p_pid, p, p->p_md.md_abi, abi));
+ KASSERTMSG(p->p_md.md_abi == abi, ("pid %d(%p): md_abi(%d) != abi(%d)", p->p_pid, p, p->p_md.md_abi, abi));
size_t nregs = 4;
#else
const int abi = p->p_md.md_abi;
