make -k work on tahoe

SCCS-vsn: usr.sbin/pstat/pstat.c 5.10
SCCS-vsn: bin/ps/ps.c 5.10

diff --git a/usr/src/bin/ps/ps.c b/usr/src/bin/ps/ps.c
index c3ff583..c569a61 100644 (file)
--- a/usr/src/bin/ps/ps.c
+++ b/usr/src/bin/ps/ps.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)ps.c       5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)ps.c       5.10 (Berkeley) %G%";

 #endif not lint
 
 #include <stdio.h>
 #endif not lint
 
 #include <stdio.h>


@@ -603,7 +603,7 @@ getkvars(argc, argv)
                        exit(1);
                }
                addr = (long) nl[X_SYSMAP].n_value;
                        exit(1);
                }
                addr = (long) nl[X_SYSMAP].n_value;

-               addr &= ~0x80000000;
+               addr &= ~KERNBASE;

                (void) lseek(kmem, addr, 0);
                read(kmem, (char *) Sysmap, Syssize * sizeof (struct pte));
        }
                (void) lseek(kmem, addr, 0);
                read(kmem, (char *) Sysmap, Syssize * sizeof (struct pte));
        }


@@ -1485,9 +1485,9 @@ long      loc;
        register        p;
        off_t   newloc;
 
        register        p;
        off_t   newloc;
 

-       newloc = loc & ~0xc0000000;
+       newloc = loc & ~KERNBASE;

        p = btop(newloc);
        p = btop(newloc);

-       if ((loc & 0xc0000000) == 0) {
+       if ((loc & KERNBASE) == 0) {

                fprintf(stderr, "Vtophys: translating non-kernel address\n");
                return((off_t) -1);
        }
                fprintf(stderr, "Vtophys: translating non-kernel address\n");
                return((off_t) -1);
        }

diff --git a/usr/src/usr.sbin/pstat/pstat.c b/usr/src/usr.sbin/pstat/pstat.c
index b0fae37..4821ebb 100644 (file)
--- a/usr/src/usr.sbin/pstat/pstat.c
+++ b/usr/src/usr.sbin/pstat/pstat.c
@@ -11,21 +11,13 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)pstat.c    5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)pstat.c    5.10 (Berkeley) %G%";

 #endif not lint
 
 /*
  * Print system stuff
  */
 
 #endif not lint
 
 /*
  * Print system stuff
  */
 

-#define mask(x) (x&0377)
-#ifdef vax
-#define        clear(x) ((int)x&0x7fffffff)
-#endif
-#ifdef tahoe
-#define        clear(x) ((int)x&~0xc0000000)
-#endif
-

 #include <sys/param.h>
 #include <sys/dir.h>
 #define        KERNEL
 #include <sys/param.h>
 #include <sys/dir.h>
 #define        KERNEL


@@ -44,6 +36,9 @@ static char sccsid[] = "@(#)pstat.c   5.9 (Berkeley) %G%";
 #include <machine/pte.h>
 #include <stdio.h>
 
 #include <machine/pte.h>
 #include <stdio.h>
 

+#define mask(x)                (x&0377)
+#define        clear(x)        ((int)x &~ KERNBASE)
+

 char   *fcore  = "/dev/kmem";
 char   *fmem   = "/dev/mem";
 char   *fnlist = "/vmunix";
 char   *fcore  = "/dev/kmem";
 char   *fmem   = "/dev/mem";
 char   *fnlist = "/vmunix";


@@ -1110,6 +1105,7 @@ mkphys(addr)
 
        if (!kflg)
                return(addr);
 
        if (!kflg)
                return(addr);

+       addr = clear(addr);

        o = addr & PGOFSET;
        addr >>= PGSHIFT;
        addr &= PG_PFNUM;
        o = addr & PGOFSET;
        addr >>= PGSHIFT;
        addr &= PG_PFNUM;