system sized at boot version

SCCS-vsn: sys/vax/uba/dh.c 4.26
SCCS-vsn: sys/kern/kern_physio.c 4.14
SCCS-vsn: sys/kern/vfs_bio.c 4.14
SCCS-vsn: sys/kern/vfs_cluster.c 4.14
SCCS-vsn: sys/vax/vax/autoconf.c 4.18
SCCS-vsn: sys/vax/vax/mem.c 4.2

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 93e0521..c88dac9 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   4.13    %G%     */
+/*     kern_physio.c   4.14    %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -60,7 +60,7 @@ struct {
        long    nreada;
        long    ncache;
        long    nwrite;
        long    nreada;
        long    ncache;
        long    nwrite;

-       long    bufcount[NBUF];
+       long    bufcount[64];

 } io_info;
 #endif
 
 } io_info;
 #endif
 


@@ -74,9 +74,9 @@ struct {
  * page push, when the I/O completes, it is inserted 
  * in a list of cleaned pages to be processed by the pageout daemon.
  */
  * page push, when the I/O completes, it is inserted 
  * in a list of cleaned pages to be processed by the pageout daemon.
  */

-struct buf swbuf[NSWBUF];
-short  swsize[NSWBUF];         /* CAN WE JUST USE B_BCOUNT? */
-int    swpf[NSWBUF];
+struct buf *swbuf;
+short  *swsize;                /* CAN WE JUST USE B_BCOUNT? */
+int    *swpf;

 
 
 #ifndef        UNFAST
 
 
 #ifndef        UNFAST


@@ -361,7 +361,7 @@ daddr_t blkno;
                        i++;
                        dp = dp->av_forw;
                }
                        i++;
                        dp = dp->av_forw;
                }

-               if (i<NBUF)
+               if (i<64)

                        io_info.bufcount[i]++;
 #endif
                notavail(bp);
                        io_info.bufcount[i]++;
 #endif
                notavail(bp);

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index a5f3ade..392907e 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*     vfs_bio.c       4.13    %G%     */
+/*     vfs_bio.c       4.14    %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -60,7 +60,7 @@ struct {
        long    nreada;
        long    ncache;
        long    nwrite;
        long    nreada;
        long    ncache;
        long    nwrite;

-       long    bufcount[NBUF];
+       long    bufcount[64];

 } io_info;
 #endif
 
 } io_info;
 #endif
 


@@ -74,9 +74,9 @@ struct {
  * page push, when the I/O completes, it is inserted 
  * in a list of cleaned pages to be processed by the pageout daemon.
  */
  * page push, when the I/O completes, it is inserted 
  * in a list of cleaned pages to be processed by the pageout daemon.
  */

-struct buf swbuf[NSWBUF];
-short  swsize[NSWBUF];         /* CAN WE JUST USE B_BCOUNT? */
-int    swpf[NSWBUF];
+struct buf *swbuf;
+short  *swsize;                /* CAN WE JUST USE B_BCOUNT? */
+int    *swpf;

 
 
 #ifndef        UNFAST
 
 
 #ifndef        UNFAST


@@ -361,7 +361,7 @@ daddr_t blkno;
                        i++;
                        dp = dp->av_forw;
                }
                        i++;
                        dp = dp->av_forw;
                }

-               if (i<NBUF)
+               if (i<64)

                        io_info.bufcount[i]++;
 #endif
                notavail(bp);
                        io_info.bufcount[i]++;
 #endif
                notavail(bp);

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 1992fac..37ad963 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*     vfs_cluster.c   4.13    %G%     */
+/*     vfs_cluster.c   4.14    %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -60,7 +60,7 @@ struct {
        long    nreada;
        long    ncache;
        long    nwrite;
        long    nreada;
        long    ncache;
        long    nwrite;

-       long    bufcount[NBUF];
+       long    bufcount[64];

 } io_info;
 #endif
 
 } io_info;
 #endif
 


@@ -74,9 +74,9 @@ struct {
  * page push, when the I/O completes, it is inserted 
  * in a list of cleaned pages to be processed by the pageout daemon.
  */
  * page push, when the I/O completes, it is inserted 
  * in a list of cleaned pages to be processed by the pageout daemon.
  */

-struct buf swbuf[NSWBUF];
-short  swsize[NSWBUF];         /* CAN WE JUST USE B_BCOUNT? */
-int    swpf[NSWBUF];
+struct buf *swbuf;
+short  *swsize;                /* CAN WE JUST USE B_BCOUNT? */
+int    *swpf;

 
 
 #ifndef        UNFAST
 
 
 #ifndef        UNFAST


@@ -361,7 +361,7 @@ daddr_t blkno;
                        i++;
                        dp = dp->av_forw;
                }
                        i++;
                        dp = dp->av_forw;
                }

-               if (i<NBUF)
+               if (i<64)

                        io_info.bufcount[i]++;
 #endif
                notavail(bp);
                        io_info.bufcount[i]++;
 #endif
                notavail(bp);

diff --git a/usr/src/sys/vax/uba/dh.c b/usr/src/sys/vax/uba/dh.c
index 828cf0c..a37208b 100644 (file)
--- a/usr/src/sys/vax/uba/dh.c
+++ b/usr/src/sys/vax/uba/dh.c
@@ -1,4 +1,4 @@
-/*     dh.c    4.25    81/02/26        */
+/*     dh.c    4.26    81/02/27        */

 
 #include "dh.h"
 #if NDH > 0
 
 #include "dh.h"
 #if NDH > 0


@@ -245,7 +245,7 @@ dhopen(dev, flag)
                /* 512+ is a kludge to try to get around a hardware problem */
                dh_ubinfo[ui->ui_ubanum] =
                    uballoc(ui->ui_ubanum, (caddr_t)cfree,
                /* 512+ is a kludge to try to get around a hardware problem */
                dh_ubinfo[ui->ui_ubanum] =
                    uballoc(ui->ui_ubanum, (caddr_t)cfree,

-                       512+NCLIST*sizeof(struct cblock), 0);
+                       512+nclist*sizeof(struct cblock), 0);

                cbase[ui->ui_ubanum] = dh_ubinfo[ui->ui_ubanum]&0x3ffff;
        }
        if ((dhact&(1<<dh)) == 0) {
                cbase[ui->ui_ubanum] = dh_ubinfo[ui->ui_ubanum]&0x3ffff;
        }
        if ((dhact&(1<<dh)) == 0) {


@@ -612,7 +612,7 @@ dhreset(uban)
        printf(" dh");
        ubarelse(uban, &dh_ubinfo[uban]);
        dh_ubinfo[uban] = uballoc(uban, (caddr_t)cfree,
        printf(" dh");
        ubarelse(uban, &dh_ubinfo[uban]);
        dh_ubinfo[uban] = uballoc(uban, (caddr_t)cfree,

-           512+NCLIST*sizeof (struct cblock), 0);
+           512+nclist*sizeof (struct cblock), 0);

        cbase[uban] = dh_ubinfo[uban]&0x3ffff;
        dh = 0;
        for (dh = 0; dh < NDH; dh++) {
        cbase[uban] = dh_ubinfo[uban]&0x3ffff;
        dh = 0;
        for (dh = 0; dh < NDH; dh++) {

diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index da56517..73182be 100644 (file)
--- a/usr/src/sys/vax/vax/autoconf.c
+++ b/usr/src/sys/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*     autoconf.c      4.17    81/02/27        */
+/*     autoconf.c      4.18    81/02/27        */

 
 /*
  * Configure the system for the current machine.
 
 /*
  * Configure the system for the current machine.


@@ -114,6 +114,7 @@ c780(pcpu)
                        }
                        mbafind(nxv, nxp);
                        nummba++;
                        }
                        mbafind(nxv, nxp);
                        nummba++;

+                       break;

 #else
                        printf("mba's");
                        goto unsupp;
 #else
                        printf("mba's");
                        goto unsupp;

diff --git a/usr/src/sys/vax/vax/mem.c b/usr/src/sys/vax/vax/mem.c
index 13e6b12..c29b5ce 100644 (file)
--- a/usr/src/sys/vax/vax/mem.c
+++ b/usr/src/sys/vax/vax/mem.c
@@ -1,4 +1,4 @@
-/*     mem.c   4.1     %G%     */
+/*     mem.c   4.2     %G%     */

 
 /*
  * Memory special file
 
 /*
  * Memory special file


@@ -47,14 +47,12 @@ mmread(dev)
                return;
 
        case 1:
                return;
 
        case 1:

-               if (u.u_uid != 0) {
-                       if ((caddr_t)u.u_offset < (caddr_t)&umbabeg &&
-                           (caddr_t)u.u_offset + u.u_count >= (caddr_t)&umbabeg)
-                               goto fault;
-                       if ((caddr_t)u.u_offset >= (caddr_t)&umbabeg &&
-                           (caddr_t)u.u_offset < (caddr_t)&umbaend)
-                               goto fault;
-               }
+               if ((caddr_t)u.u_offset < (caddr_t)&umbabeg &&
+                   (caddr_t)u.u_offset + u.u_count >= (caddr_t)&umbabeg)
+                       goto fault;
+               if ((caddr_t)u.u_offset >= (caddr_t)&umbabeg &&
+                   (caddr_t)u.u_offset < (caddr_t)&umbaend)
+                       goto fault;

                if (!kernacc((caddr_t)u.u_offset, u.u_count, B_READ))
                        goto fault;
                if (copyout((caddr_t)u.u_offset, u.u_base, u.u_count))
                if (!kernacc((caddr_t)u.u_offset, u.u_count, B_READ))
                        goto fault;
                if (copyout((caddr_t)u.u_offset, u.u_base, u.u_count))