cosmetics

SCCS-vsn: sys/vax/uba/ubareg.h 4.13
SCCS-vsn: sys/vax/uba/ubavar.h 4.13
SCCS-vsn: sys/vax/include/pcb.h 4.4
SCCS-vsn: sys/sys/proc.h 4.4
SCCS-vsn: sys/vax/include/trap.h 4.4
SCCS-vsn: sys/sys/vmmeter.h 4.3
SCCS-vsn: sys/vax/include/cpu.h 4.3

diff --git a/usr/src/sys/sys/proc.h b/usr/src/sys/sys/proc.h
index b50884b..ebc7bf9 100644 (file)
--- a/usr/src/sys/sys/proc.h
+++ b/usr/src/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*     proc.h  4.3     81/02/19        */
+/*     proc.h  4.4     81/02/26        */

 
 /*
  * One structure allocated per active
 
 /*
  * One structure allocated per active


@@ -7,8 +7,6 @@
  * process may be swapped out.
  * Other per process data (user.h)
  * is swapped with the process.
  * process may be swapped out.
  * Other per process data (user.h)
  * is swapped with the process.

- *
- * NB: OFFSETS HERE ARE ALSO DEFINED IN proc.m

  */
 struct proc
 {
  */
 struct proc
 {


@@ -64,16 +62,12 @@ struct      proc *pfind();
 #ifdef KERNEL
 extern struct proc proc[];     /* the proc table itself */
 
 #ifdef KERNEL
 extern struct proc proc[];     /* the proc table itself */
 

-#ifdef FASTVAX

 #define        NQS     32              /* 32 run queues */
 struct prochd {
        struct  proc *ph_link;  /* linked list of running processes */
        struct  proc *ph_rlink;
 } qs[NQS];
 int    whichqs;                /* bit mask summarizing non-empty qs's */
 #define        NQS     32              /* 32 run queues */
 struct prochd {
        struct  proc *ph_link;  /* linked list of running processes */
        struct  proc *ph_rlink;
 } qs[NQS];
 int    whichqs;                /* bit mask summarizing non-empty qs's */

-#else
-struct proc *runq;
-#endif

 #endif
 
 /* stat codes */
 #endif
 
 /* stat codes */

diff --git a/usr/src/sys/sys/vmmeter.h b/usr/src/sys/sys/vmmeter.h
index bb33905..f0d1d74 100644 (file)
--- a/usr/src/sys/sys/vmmeter.h
+++ b/usr/src/sys/sys/vmmeter.h
@@ -1,10 +1,8 @@
 
 

-/*     vmmeter.h       4.2     %G%     */
+/*     vmmeter.h       4.3     %G%     */

 
 /*
  * Virtual memory related instrumentation
 
 /*
  * Virtual memory related instrumentation

- *
- * NB: THE OFFSETS IN THE vmmeter STRUCTURE ARE KNOWN IN vm.m.

  */
 struct vmmeter
 {
  */
 struct vmmeter
 {

diff --git a/usr/src/sys/vax/include/cpu.h b/usr/src/sys/vax/include/cpu.h
index 43be303..7397347 100644 (file)
--- a/usr/src/sys/vax/include/cpu.h
+++ b/usr/src/sys/vax/include/cpu.h
@@ -1,5 +1,6 @@
-/*     cpu.h   4.2     81/02/19        */
+/*     cpu.h   4.3     81/02/26        */

 
 

+#ifndef LOCORE

 /*
  * Cpu identification, from SID register.
  */
 /*
  * Cpu identification, from SID register.
  */


@@ -22,11 +23,13 @@ union cpusid {
                        cp_type:8;              /* VAX_750 */
        } cpu750;
 };
                        cp_type:8;              /* VAX_750 */
        } cpu750;
 };

+#endif

 #define        VAX_780         1
 #define        VAX_750         2
 
 #define        VAX_MAX         2
 
 #define        VAX_780         1
 #define        VAX_750         2
 
 #define        VAX_MAX         2
 

+#ifndef LOCORE

 /*
  * Per-cpu information for system.
  */
 /*
  * Per-cpu information for system.
  */


@@ -38,3 +41,4 @@ struct        percpu {
 #ifdef KERNEL
 int    cpu;
 #endif
 #ifdef KERNEL
 int    cpu;
 #endif

+#endif

diff --git a/usr/src/sys/vax/include/pcb.h b/usr/src/sys/vax/include/pcb.h
index 24f0e3d..3df5174 100644 (file)
--- a/usr/src/sys/vax/include/pcb.h
+++ b/usr/src/sys/vax/include/pcb.h
@@ -1,11 +1,7 @@
-/*     pcb.h   4.3     81/02/19        */
+/*     pcb.h   4.4     81/02/26        */

 
 /*
  * VAX process control block
 
 /*
  * VAX process control block

- *
- * THE SIZE OF THE pcb, AS INFLUENCED BY THE SIZE OF THE SOFTWARE
- * EXTENSION, IS KNOWN IN THE #ifdef FASTVAX'ed DEFINITIONS OF THE
- * OFFSETS OF U_ARG and U_QSAV IN THE FILE user.h.

  */
 
 struct pcb
  */
 
 struct pcb

diff --git a/usr/src/sys/vax/include/trap.h b/usr/src/sys/vax/include/trap.h
index 7e9795e..a06ddd2 100644 (file)
--- a/usr/src/sys/vax/include/trap.h
+++ b/usr/src/sys/vax/include/trap.h
@@ -1,9 +1,7 @@
-/*     trap.h  4.3     81/02/19        */
+/*     trap.h  4.4     81/02/26        */

 
 /*
  * Trap type values
 
 /*
  * Trap type values

- *
- * NB: OFFSETS HERE ARE ALSO DEFINED IN trap.m

  */
 
 #define        RESADFLT        0               /* reserved addressing fault */
  */
 
 #define        RESADFLT        0               /* reserved addressing fault */

diff --git a/usr/src/sys/vax/uba/ubareg.h b/usr/src/sys/vax/uba/ubareg.h
index 7a453ce..e8d1f0e 100644 (file)
--- a/usr/src/sys/vax/uba/ubareg.h
+++ b/usr/src/sys/vax/uba/ubareg.h
@@ -1,4 +1,4 @@
-/*     ubareg.h        4.12    81/02/23        */
+/*     ubareg.h        4.13    81/02/26        */

 
 /*
  * UNIBUS adaptor
 
 /*
  * UNIBUS adaptor


@@ -139,8 +139,6 @@ struct uba_dinfo {
 
 /*
  * This structure exists per-uba.
 
 /*
  * This structure exists per-uba.

- *
- * N.B.: THE SIZE AND SHAPE OF THIS STRUCTURE IS KNOWN IN uba.m.

  */
 struct uba_hd {
        struct  uba_regs *uh_uba;       /* virt addr of uba */
  */
 struct uba_hd {
        struct  uba_regs *uh_uba;       /* virt addr of uba */

diff --git a/usr/src/sys/vax/uba/ubavar.h b/usr/src/sys/vax/uba/ubavar.h
index b7340ea..8143f1e 100644 (file)
--- a/usr/src/sys/vax/uba/ubavar.h
+++ b/usr/src/sys/vax/uba/ubavar.h
@@ -1,4 +1,4 @@
-/*     ubavar.h        4.12    81/02/23        */
+/*     ubavar.h        4.13    81/02/26        */

 
 /*
  * UNIBUS adaptor
 
 /*
  * UNIBUS adaptor


@@ -139,8 +139,6 @@ struct uba_dinfo {
 
 /*
  * This structure exists per-uba.
 
 /*
  * This structure exists per-uba.

- *
- * N.B.: THE SIZE AND SHAPE OF THIS STRUCTURE IS KNOWN IN uba.m.

  */
 struct uba_hd {
        struct  uba_regs *uh_uba;       /* virt addr of uba */
  */
 struct uba_hd {
        struct  uba_regs *uh_uba;       /* virt addr of uba */