Eliminated the "physstrat" wart and merged it into kern_physio.c. This

[unix-history] / sys / kern / sys_generic.c

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 40a30c8..b32b92a 100644 (file)
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)sys_generic.c 7.30 (Berkeley) 5/30/91
  * SUCH DAMAGE.
  *
  *     from: @(#)sys_generic.c 7.30 (Berkeley) 5/30/91

- *     $Id$
+ *     $Id: sys_generic.c,v 1.5 1993/11/25 01:33:20 wollman Exp $

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -45,6 +45,7 @@
 #include "kernel.h"
 #include "stat.h"
 #include "malloc.h"
 #include "kernel.h"
 #include "stat.h"
 #include "malloc.h"

+#include "signalvar.h"

 #ifdef KTRACE
 #include "ktrace.h"
 #endif
 #ifdef KTRACE
 #include "ktrace.h"
 #endif


@@ -59,6 +60,7 @@ struct read_args {
  * Read system call.
  */
 /* ARGSUSED */
  * Read system call.
  */
 /* ARGSUSED */

+int

 read(p, uap, retval)
        struct proc *p;
        register struct read_args *uap;
 read(p, uap, retval)
        struct proc *p;
        register struct read_args *uap;


@@ -117,6 +119,7 @@ struct readv_args {
 };
 
 /* ARGSUSED */
 };
 
 /* ARGSUSED */

+int

 readv(p, uap, retval)
        struct proc *p;
        register struct readv_args *uap;
 readv(p, uap, retval)
        struct proc *p;
        register struct readv_args *uap;


@@ -126,7 +129,7 @@ readv(p, uap, retval)
        register struct filedesc *fdp = p->p_fd;
        struct uio auio;
        register struct iovec *iov;
        register struct filedesc *fdp = p->p_fd;
        struct uio auio;
        register struct iovec *iov;

-       struct iovec *saveiov;
+       struct iovec *saveiov = 0;

        struct iovec aiov[UIO_SMALLIOV];
        long i, cnt, error = 0;
        unsigned iovlen;
        struct iovec aiov[UIO_SMALLIOV];
        long i, cnt, error = 0;
        unsigned iovlen;


@@ -207,6 +210,7 @@ struct write_args {
        unsigned count;
 };
 
        unsigned count;
 };
 

+int

 write(p, uap, retval)
        struct proc *p;
        register struct write_args *uap;
 write(p, uap, retval)
        struct proc *p;
        register struct write_args *uap;


@@ -268,6 +272,7 @@ struct writev_args {
        unsigned iovcnt;
 };
 
        unsigned iovcnt;
 };
 

+int

 writev(p, uap, retval)
        struct proc *p;
        register struct writev_args *uap;
 writev(p, uap, retval)
        struct proc *p;
        register struct writev_args *uap;


@@ -277,7 +282,7 @@ writev(p, uap, retval)
        register struct filedesc *fdp = p->p_fd;
        struct uio auio;
        register struct iovec *iov;
        register struct filedesc *fdp = p->p_fd;
        struct uio auio;
        register struct iovec *iov;

-       struct iovec *saveiov;
+       struct iovec *saveiov = 0;

        struct iovec aiov[UIO_SMALLIOV];
        long i, cnt, error = 0;
        unsigned iovlen;
        struct iovec aiov[UIO_SMALLIOV];
        long i, cnt, error = 0;
        unsigned iovlen;


@@ -362,6 +367,7 @@ struct ioctl_args {
 };
 
 /* ARGSUSED */
 };
 
 /* ARGSUSED */

+int

 ioctl(p, uap, retval)
        struct proc *p;
        register struct ioctl_args *uap;
 ioctl(p, uap, retval)
        struct proc *p;
        register struct ioctl_args *uap;


@@ -500,6 +506,7 @@ struct select_args {
                struct  timeval *tv;
 };
 
                struct  timeval *tv;
 };
 

+int

 select(p, uap, retval)
        register struct proc *p;
        register struct select_args *uap;
 select(p, uap, retval)
        register struct proc *p;
        register struct select_args *uap;


@@ -605,6 +612,7 @@ selscan(struct proc *p, fd_set *ibits, fd_set *obits, int nfd, int *retval)
                case 1:
                        flag = FWRITE; break;
 
                case 1:
                        flag = FWRITE; break;
 

+               default:        /* pacify GCC */

                case 2:
                        flag = 0; break;
                }
                case 2:
                        flag = 0; break;
                }


@@ -630,14 +638,14 @@ selscan(struct proc *p, fd_set *ibits, fd_set *obits, int nfd, int *retval)
 
 /*ARGSUSED*/
 int
 
 /*ARGSUSED*/
 int

-seltrue(dev_t dev, int which, struct proc *p)
+seltrue(int /*dev_t*/ dev, int which, struct proc *p)

 {
 
        return (1);
 }
 
 void
 {
 
        return (1);
 }
 
 void

-selwakeup(pid_t pid, int coll)
+selwakeup(int /*pid_t*/ pid, int coll)

 {
        register struct proc *p;
 
 {
        register struct proc *p;