CVS commit: src/sys/arch/hppa/hppa

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Wed Jan  6 07:38:49 UTC 2010

Modified Files:
        src/sys/arch/hppa/hppa: trap.c

Log Message:
curlwp is never NULL now. Sprinkle KASSERT just in case.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.63 src/sys/arch/hppa/hppa/trap.c:1.64
--- src/sys/arch/hppa/hppa/trap.c:1.63	Fri Nov 27 20:32:10 2009
+++ src/sys/arch/hppa/hppa/trap.c	Wed Jan  6 07:38:49 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.63 2009/11/27 20:32:10 skrll Exp $	*/
+/*	$NetBSD: trap.c,v 1.64 2010/01/06 07:38:49 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.63 2009/11/27 20:32:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.64 2010/01/06 07:38:49 skrll Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -512,8 +512,9 @@
 		vftype = inst_store(opcode) ? VM_PROT_WRITE : VM_PROT_READ;
 	}
 
+	KASSERT(curlwp != NULL);
 	l = curlwp;
-	p = l ? l->l_proc : NULL;
+	p = l->l_proc;
 	if ((type & T_USER) != 0)
 		LWP_CACHE_CREDS(l, p);
 
@@ -1093,6 +1094,7 @@
 	if (!USERMODE(frame->tf_iioq_head))
 		panic("syscall");
 
+	KASSERT(curlwp != NULL);
 	l = curlwp;
 	p = l->l_proc;
 	l->l_md.md_regs = frame;