*** empty log message ***

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index 5438f86cd8b39b3ab4a0a3fdfce3e7696bc5b4d5..791b72762090b3f8a2511688b7967e062ded7cab 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -32,8 +32,8 @@
  * Most fields are similar to V7 ps(1), except for CPU, NICE, PRI which are
  * absent, RECV which replaces WCHAN, and PGRP that is an extra.
  * The info is obtained from the following fields of proc, mproc and fproc:
- * F   - kernel status field, p_flags
- * S   - kernel status field, p_flags; mm status field, mp_flags (R if p_flags
+ * F   - kernel status field, p_rts_flags
+ * S   - kernel status field, p_rts_flags; mm status field, mp_flags (R if p_rts_flags
  *       is 0; Z if mp_flags == ZOMBIE; T if mp_flags == STOPPED; else W).
  * UID - mm eff uid field, mp_effuid
  * PID - mm pid field, mp_pid
@@ -461,11 +461,11 @@ struct pstat *bufp;
 
   if (p_nr < -nr_tasks || p_nr >= nr_procs) return -1;
 
-  if ((ps_proc[p_ki].p_flags == SLOT_FREE)
+  if ((ps_proc[p_ki].p_rts_flags == SLOT_FREE)
                                && !(ps_mproc[p_nr].mp_flags & IN_USE))
        return -1;
 
-  bufp->ps_flags = ps_proc[p_ki].p_flags;
+  bufp->ps_flags = ps_proc[p_ki].p_rts_flags;
 
   if (p_nr >= low_user) {
        bufp->ps_dev = ps_fproc[p_nr].fp_tty;
@@ -496,7 +496,7 @@ struct pstat *bufp;
                bufp->ps_state = Z_STATE;       /* zombie */
        else if (ps_mproc[p_nr].mp_flags & STOPPED)
                bufp->ps_state = T_STATE;       /* stopped (traced) */
-       else if (ps_proc[p_ki].p_flags == 0)
+       else if (ps_proc[p_ki].p_rts_flags == 0)
                bufp->ps_state = R_STATE;       /* in run-queue */
        else if (ps_mproc[p_nr].mp_flags & (WAITING | PAUSED | SIGSUSPENDED) ||
                 ps_fproc[p_nr].fp_suspended == SUSPENDED)
@@ -504,7 +504,7 @@ struct pstat *bufp;
        else
                bufp->ps_state = W_STATE;       /* a short wait */
   } else {                     /* tasks are simple */
-       if (ps_proc[p_ki].p_flags == 0)
+       if (ps_proc[p_ki].p_rts_flags == 0)
                bufp->ps_state = R_STATE;       /* in run-queue */
        else
                bufp->ps_state = W_STATE;       /* other i.e. waiting */

diff --git a/tools/Makefile b/tools/Makefile
index 25e8a9044f15fbb29d4f305525c661f28e7ac115..fff78145be14f587dd6bfae407aa5bec9e2c993c 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -75,9 +75,11 @@ bootable:
 
 hdboot:        image
        exec sh mkboot $@
+       @sync
 
 fdboot:        image
        exec su root mkboot $@
+       @sync
 
 install: hdboot