diff -rNPc --exclude=CVS freebsd7_vanilla/src/sys/conf/options.i386 freebsd7/src/sys/conf/options.i386
*** freebsd7_vanilla/src/sys/conf/options.i386	Sat Jul 29 20:38:53 2006
--- freebsd7/src/sys/conf/options.i386	Mon Nov  6 15:01:16 2006
***************
*** 150,152 ****
--- 150,155 ----
  
  # BPF just-in-time compiler
  BPF_JITTER		opt_bpf.h
+ 
+ # timestamp counter register
+ KERN_TIMESTAMP                opt_global.h
diff -rNPc --exclude=CVS freebsd7_vanilla/src/sys/i386/isa/clock.c freebsd7/src/sys/i386/isa/clock.c
*** freebsd7_vanilla/src/sys/i386/isa/clock.c	Thu Aug 10 01:47:38 2006
--- freebsd7/src/sys/i386/isa/clock.c	Mon Nov  6 14:45:34 2006
***************
*** 897,902 ****
--- 897,928 ----
  SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW,
      0, sizeof(u_int), sysctl_machdep_i8254_freq, "IU", "");
  
+ #ifdef KERN_TIMESTAMP
+ u_int16_t td_cnt = 1;
+ int td_src = 0;
+ #define L_TSC_SIZE (1<<16)
+ static u_long tsc[L_TSC_SIZE] ;
+ SYSCTL_OPAQUE(_debug, OID_AUTO, timestamp, CTLFLAG_RD, tsc,
+       sizeof(tsc), "LU", "Kernel timestamps");
+ SYSCTL_INT(_debug, OID_AUTO, source, CTLFLAG_RW, &td_src,
+ 	   0, "Interrupt source");
+ void
+ _TSTMP(u_int32_t x, u_int32_t y)
+ {
+       static int i ;
+ 
+     __asm __volatile("pushfl ; cli" : : : "memory");
+ 
+     tsc[i] = (y != 0) ? y : (u_int32_t)rdtsc();
+     tsc[i+1] = x ;
+     i = i + 2 ;
+     if (i >= L_TSC_SIZE)
+           i = 0 ;
+     tsc[i] = 0 ; /* mark last entry */
+     __asm __volatile("popfl" : : : "memory");
+ }
+ #endif
+ 
  static unsigned
  i8254_simple_get_timecount(struct timecounter *tc)
  {
diff -rNPc --exclude=CVS freebsd7_vanilla/src/sys/sys/param.h freebsd7/src/sys/sys/param.h
*** freebsd7_vanilla/src/sys/sys/param.h	Sun Sep  3 03:12:34 2006
--- freebsd7/src/sys/sys/param.h	Mon Nov  6 15:02:22 2006
***************
*** 63,68 ****
--- 63,92 ----
  #include <sys/types.h>
  #endif
  
+ #ifdef _KERNEL        /* debugging macros accessing the TSC */
+ 
+ #define NOTSTMP(a,b,c,d)
+ #ifdef KERN_TIMESTAMP
+ #define TSTMP(class, unit, event, par)                  \
+         _TSTMP(    (((class) &15) <<    28 ) |          \
+                 (((unit) & 15) <<       24 ) |          \
+                 (((event)&255) <<       16 ) |          \
+                 (((par) & 0xffff)          ),           \
+                 0                          )
+ #define WTSTMP(class, unit, event, par, tsc)    \
+         _TSTMP(    (((class) &15) <<    28 ) |          \
+                 (((unit) & 15) <<       24 ) |          \
+                 (((event)&255) <<       16 ) |          \
+                 (((par) & 0xffff)          ),           \
+                 tsc                        )
+ extern void _TSTMP(u_int32_t, u_int32_t);
+ #else /* !KERN_TIMESTAMP */
+ #define TSTMP(class, unit, event, par)  _TSTMP(0)
+ #define _TSTMP(x)                     do {} while (0)
+ #endif /* !KERN_TIMESTAMP */
+ #endif
+ 
+ 
  /*
   * Machine-independent constants (some used in following include files).
   * Redefined constants are from POSIX 1003.1 limits file.
diff -rNPc --exclude=CVS freebsd7_vanilla/src/sys/sys/proc.h freebsd7/src/sys/sys/proc.h
*** freebsd7_vanilla/src/sys/sys/proc.h	Fri Aug 25 05:15:27 2006
--- freebsd7/src/sys/sys/proc.h	Mon Nov  6 15:03:20 2006
***************
*** 331,336 ****
--- 331,337 ----
  	struct mdthread td_md;		/* (k) Any machine-dependent fields. */
  	struct td_sched	*td_sched;	/* (*) Scheduler-specific data. */
  	struct kaudit_record	*td_ar;	/* (k) Active audit record, if any. */
+ 	u_int16_t       td_id;
  };
  
  /*