svn commit: r258802 - head/sys/powerpc/powerpc

Nathan Whitehorn nwhitehorn at FreeBSD.org
Sun Dec 1 17:29:07 UTC 2013


Author: nwhitehorn
Date: Sun Dec  1 17:29:07 2013
New Revision: 258802
URL: http://svnweb.freebsd.org/changeset/base/258802

Log:
  Remove unnecessary double-setting of the thread's onfault state in
  copyinstr().

Modified:
  head/sys/powerpc/powerpc/copyinout.c

Modified: head/sys/powerpc/powerpc/copyinout.c
==============================================================================
--- head/sys/powerpc/powerpc/copyinout.c	Sun Dec  1 17:29:00 2013	(r258801)
+++ head/sys/powerpc/powerpc/copyinout.c	Sun Dec  1 17:29:07 2013	(r258802)
@@ -250,22 +250,11 @@ copyin(const void *udaddr, void *kaddr, 
 int
 copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done)
 {
-	struct		thread *td;
-	pmap_t		pm;
-	faultbuf	env;
 	const char	*up;
 	char		*kp;
 	size_t		l;
 	int		rv, c;
 
-	td = curthread;
-	pm = &td->td_proc->p_vmspace->vm_pmap;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
 	kp = kaddr;
 	up = udaddr;
 
@@ -288,7 +277,6 @@ copyinstr(const void *udaddr, void *kadd
 		*done = l;
 	}
 
-	td->td_pcb->pcb_onfault = NULL;
 	return (rv);
 }
 


More information about the svn-src-head mailing list