merge

[plan9front.git] / sys / src / 9 / zynq / dat.h

diff --git a/sys/src/9/zynq/dat.h b/sys/src/9/zynq/dat.h
index 91d95671b249dc5520ab2730b710aad5a2da6d77..7431ed80319095b1190da335f7a86071cf36d260 100644 (file)
--- a/sys/src/9/zynq/dat.h
+++ b/sys/src/9/zynq/dat.h
@@ -11,7 +11,6 @@ typedef struct Notsave        Notsave;
 typedef struct Page    Page;
 typedef struct Proc    Proc;
 typedef struct PMMU    PMMU;
-typedef u32int         PTE;
 typedef struct Ureg    Ureg;
 typedef struct ISAConf ISAConf;
 typedef uvlong         Tval;
@@ -150,9 +149,6 @@ struct Mach
        int     syscall;
        int     load;
        int     intr;
-       uvlong  fastclock;              /* last sampled value */
-       uvlong  inidle;                 /* time spent in idlehands() */
-//     ulong   spuriousintr;
        int     lastintr;
        int     ilockdepth;
        Perf    perf;                   /* performance counters */
@@ -178,10 +174,8 @@ struct ISAConf
 
 struct
 {
-       Lock;
-       int     machs;                  /* bitmap of active CPUs */
+       char    machs[MAXMACH];         /* active CPUs */
        int     exiting;                /* shutdown */
-       int     ispanic;                /* shutdown in response to a panic */
 }active;
 
 extern register Mach* m;                       /* R10 */