merge in netbsd changes.

[unix-history] / usr / src / sys / miscfs / procfs / procfs_mem.c

diff --git a/usr/src/sys/miscfs/procfs/procfs_mem.c b/usr/src/sys/miscfs/procfs/procfs_mem.c
index 2152622..ef8f24c 100644 (file)
--- a/usr/src/sys/miscfs/procfs/procfs_mem.c
+++ b/usr/src/sys/miscfs/procfs/procfs_mem.c
@@ -1,14 +1,15 @@
 /*
 /*

- * Copyright (c) 1993 The Regents of the University of California.

  * Copyright (c) 1993 Jan-Simon Pendry
  * Copyright (c) 1993 Jan-Simon Pendry

- * All rights reserved.
+ * Copyright (c) 1993 Sean Eric Fagan
+ * Copyright (c) 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry and Sean Eric Fagan.
  *
  * %sccs.include.redist.c%
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry and Sean Eric Fagan.
  *
  * %sccs.include.redist.c%
  *

- *     @(#)procfs_mem.c        8.2 (Berkeley) %G%
+ *     @(#)procfs_mem.c        8.5 (Berkeley) %G%

  *
  * From:
  *     $Id: procfs_mem.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
  *
  * From:
  *     $Id: procfs_mem.c,v 3.2 1993/12/15 09:40:17 jsp Exp $


@@ -179,14 +180,11 @@ procfs_domem(curp, p, pfs, uio)
        struct pfsnode *pfs;
        struct uio *uio;
 {
        struct pfsnode *pfs;
        struct uio *uio;
 {

-       int error;

 
        if (uio->uio_resid == 0)
                return (0);
 
 
        if (uio->uio_resid == 0)
                return (0);
 

-       error = procfs_rwmem(p, uio);
-
-       return (error);
+       return (procfs_rwmem(p, uio));

 }
 
 /*
 }
 
 /*


@@ -204,6 +202,7 @@ struct vnode *
 procfs_findtextvp(p)
        struct proc *p;
 {
 procfs_findtextvp(p)
        struct proc *p;
 {

+

        return (p->p_textvp);
 }
 
        return (p->p_textvp);
 }