cprofile always on; data type and definitions to include file

diff --git a/include/minix/profile.h b/include/minix/profile.h
index 91193a4b91b4d8d3b589f7e797ec34f2e23afc14..b242dae0c381e4b6c5d7dd4ba14335383e53778a 100644 (file)
--- a/include/minix/profile.h
+++ b/include/minix/profile.h
@@ -31,8 +31,6 @@ struct {
 #endif /* SPROFILE */
 
 
-#if CPROFILE
-
 #include <sys/types.h>
 
 #  define PROF_GET         2    /* get call profiling tables */
@@ -97,8 +95,6 @@ struct cprof_tbl_s {
   u64_t cycles;                                /* execution time of path, in cycles */
 } cprof_tbl_inst;
 
-#endif /* CPROFILE */
-
 _PROTOTYPE( int sprofile, (int action, int size, int freq, 
                                        void *ctl_ptr, void *mem_ptr)   );
 

diff --git a/include/minix/sysutil.h b/include/minix/sysutil.h
index e2f87878ac37c6b4d2f06033b4a65451ad45e0bc..31a1edb012cc85980932023774451f42e14479e5 100644 (file)
--- a/include/minix/sysutil.h
+++ b/include/minix/sysutil.h
@@ -73,9 +73,10 @@ struct util_timingdata {
         unsigned long lock_timings[TIMING_POINTS]; 
         unsigned long lock_timings_range[2];
         unsigned long binsize, resets, misses, measurements;
+       unsigned long starttimes[2];    /* nonzero if running */
 };
 
-typedef struct util_timingdata util_timingdata_t[TIMING_CATEGORIES];
+typedef struct util_timingdata util_timingdata_t;
 
 #endif /* _MINIX_SYSUTIL_H */