CVS commit: src/sys/arch/usermode/usermode

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Thu Sep  8 11:56:48 UTC 2011

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

Log Message:
Remove struct trapframe


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/usermode/usermode/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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.33 src/sys/arch/usermode/usermode/trap.c:1.34
--- src/sys/arch/usermode/usermode/trap.c:1.33	Wed Sep  7 14:03:49 2011
+++ src/sys/arch/usermode/usermode/trap.c	Thu Sep  8 11:56:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.33 2011/09/07 14:03:49 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.34 2011/09/08 11:56:48 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.33 2011/09/07 14:03:49 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.34 2011/09/08 11:56:48 reinoud Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -100,7 +100,6 @@
 //	debug_fh = thunk_open("/usr/sources/debug", O_RDWR | O_TRUNC | O_CREAT, 0666);
 }
 
-static struct trapframe kernel_tf;
 
 static void
 mem_access_handler(int sig, siginfo_t *info, void *ctx)
@@ -113,7 +112,6 @@
 	struct pcb *pcb;
 	struct vmspace *vm;
 	struct vm_map *vm_map;
-	struct trapframe *tf;
 	vm_prot_t atype;
 	vaddr_t va;
 	void *onfault;
@@ -214,8 +212,8 @@
 					panic("kernel fault");
 				panic("%s: can't call onfault yet\n", __func__);
 				/* jump to given onfault */
-				tf = &kernel_tf;
-				memset(tf, 0, sizeof(struct trapframe));
+				// tf = &kernel_tf;
+				// memset(tf, 0, sizeof(struct trapframe));
 				// tf->tf_pc = onfault;
 				// tf->tf_io[0] = (rv == EACCES) ? EFAULT : rv;
 				recurse--;