various minor fixups pre-split to dev dir

SCCS-vsn: sys/sys/conf.h 3.7
SCCS-vsn: sys/sys/dmap.h 3.3
SCCS-vsn: sys/sys/map.h 3.3
SCCS-vsn: sys/sys/systm.h 3.4

diff --git a/usr/src/sys/sys/conf.h b/usr/src/sys/sys/conf.h
index 0631aee..0051c41 100644 (file)
--- a/usr/src/sys/sys/conf.h
+++ b/usr/src/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*     conf.h  3.6     %G%     */
+/*     conf.h  3.7     %G%     */

 
 /*
  * Declaration of block device
 
 /*
  * Declaration of block device


@@ -48,3 +48,12 @@ extern struct linesw
        int     (*l_start)();
        int     (*l_modem)();
 } linesw[];
        int     (*l_start)();
        int     (*l_modem)();
 } linesw[];

+
+/*
+ * Swap device information
+ */
+extern struct swdevt
+{
+       dev_t   sw_dev;
+       int     sw_freed;
+} swdevt[];

diff --git a/usr/src/sys/sys/dmap.h b/usr/src/sys/sys/dmap.h
index 115ec98..acafb90 100644 (file)
--- a/usr/src/sys/sys/dmap.h
+++ b/usr/src/sys/sys/dmap.h
@@ -1,4 +1,4 @@
-/*     dmap.h  3.2     %G%     */
+/*     dmap.h  3.3     %G%     */

 
 /*
  * Definitions for the mapping of vitual swap
 
 /*
  * Definitions for the mapping of vitual swap


@@ -8,6 +8,7 @@
 #define        NDMAP           16      /* size of the swap area map */
 #define        DMMIN           16      /* the initial block size in clicks */
 #define        DMMAX           1024    /* max block size alloc on drum = .5M byte */
 #define        NDMAP           16      /* size of the swap area map */
 #define        DMMIN           16      /* the initial block size in clicks */
 #define        DMMAX           1024    /* max block size alloc on drum = .5M byte */

+#define        DMTEXT          1024    /* size of blocks of pure text = .5M byte */

 
 struct dmap
 {
 
 struct dmap
 {

diff --git a/usr/src/sys/sys/map.h b/usr/src/sys/sys/map.h
index 0e8500e..a19950f 100644 (file)
--- a/usr/src/sys/sys/map.h
+++ b/usr/src/sys/sys/map.h
@@ -1,4 +1,4 @@
-/*     map.h   3.2     %G%     */
+/*     map.h   3.3     %G%     */

 
 /*
  * Resource Allocation Maps
 
 /*
  * Resource Allocation Maps


@@ -11,6 +11,8 @@ struct map
 
 #ifdef KERNEL
 struct map swapmap[SMAPSIZ];   /* space for swap allocation */
 
 #ifdef KERNEL
 struct map swapmap[SMAPSIZ];   /* space for swap allocation */

+#define        AMAPSIZ 25
+struct map argmap[AMAPSIZ];

 
 struct map kernelmap[NPROC];   /* space for kernel map for user page tables */
 #endif
 
 struct map kernelmap[NPROC];   /* space for kernel map for user page tables */
 #endif

diff --git a/usr/src/sys/sys/systm.h b/usr/src/sys/sys/systm.h
index 337c3ec..b90c891 100644 (file)
--- a/usr/src/sys/sys/systm.h
+++ b/usr/src/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*     systm.h 3.3     %G%     */
+/*     systm.h 3.4     %G%     */

 
 /*
  * Random set of variables
 
 /*
  * Random set of variables


@@ -30,6 +30,7 @@ int   nblkdev;
  */
 int    nchrdev;
 
  */
 int    nchrdev;
 

+int    nswdev;                 /* number of swap devices */

 int    mpid;                   /* generic for unique process id's */
 char   runin;                  /* scheduling flag */
 char   runout;                 /* scheduling flag */
 int    mpid;                   /* generic for unique process id's */
 char   runin;                  /* scheduling flag */
 char   runout;                 /* scheduling flag */


@@ -40,7 +41,6 @@ char  curpri;                 /* more scheduling */
 int    maxmem;                 /* actual max memory per process */
 int    physmem;                /* physical memory on this CPU */
 
 int    maxmem;                 /* actual max memory per process */
 int    physmem;                /* physical memory on this CPU */
 

-daddr_t        swplo;                  /* block number of swap space */

 int    nswap;                  /* size of swap space */
 int    updlock;                /* lock for sync */
 daddr_t        rablock;                /* block to be read ahead */
 int    nswap;                  /* size of swap space */
 int    updlock;                /* lock for sync */
 daddr_t        rablock;                /* block to be read ahead */


@@ -48,6 +48,7 @@ char  msgbuf[MSGBUFS];        /* saved "printf" characters */
 int    intstack[512];          /* stack for interrupts */
 dev_t  rootdev;                /* device of the root */
 dev_t  swapdev;                /* swapping device */
 int    intstack[512];          /* stack for interrupts */
 dev_t  rootdev;                /* device of the root */
 dev_t  swapdev;                /* swapping device */

+dev_t  argdev;

 dev_t  pipedev;                /* pipe device */
 
 extern int icode[];            /* user init code */
 dev_t  pipedev;                /* pipe device */
 
 extern int icode[];            /* user init code */


@@ -64,15 +65,6 @@ int  memall();
 int    uchar();
 int    vmemall();
 swblk_t        vtod();
 int    uchar();
 int    vmemall();
 swblk_t        vtod();

-/*
- * Instrumentation
- */
-int    dk_busy;
-long   dk_time[32];
-long   dk_numb[3];
-long   dk_wds[3];
-long   tk_nin;
-long   tk_nout;

 
 /*
  * Structure of the system-entry table
 
 /*
  * Structure of the system-entry table