PERFORCE change 143162 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=143162

Change 143162 by jb at freebsd3 on 2008/06/09 03:16:22

	Update to suit releng6 types.

Affected files ...

.. //depot/projects/dtrace6/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 edit
.. //depot/projects/dtrace6/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 (text+ko) ====

@@ -80,16 +80,16 @@
  * initialiser as the callback for high speed timer events.
  */
 static void
-cyclic_clock(struct trapframe *frame)
+cyclic_clock(struct clockframe *frame)
 {
 	cpu_t *c = &solaris_cpu[curcpu];
 
 	if (c->cpu_cyclic != NULL && gethrtime() >= exp_due[curcpu]) {
-		if (TRAPF_USERMODE(frame)) {
+		if (CLKF_USERMODE(frame)) {
 			c->cpu_profile_pc = 0;
-			c->cpu_profile_upc = TRAPF_PC(frame);
+			c->cpu_profile_upc = CLKF_PC(frame);
 		} else {
-			c->cpu_profile_pc = TRAPF_PC(frame);
+			c->cpu_profile_pc = CLKF_PC(frame);
 			c->cpu_profile_upc = 0;
 		}
 

==== //depot/projects/dtrace6/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 (text+ko) ====

@@ -80,16 +80,16 @@
  * initialiser as the callback for high speed timer events.
  */
 static void
-cyclic_clock(struct trapframe *frame)
+cyclic_clock(struct clockframe *frame)
 {
 	cpu_t *c = &solaris_cpu[curcpu];
 
 	if (c->cpu_cyclic != NULL && gethrtime() >= exp_due[curcpu]) {
-		if (TRAPF_USERMODE(frame)) {
+		if (CLKF_USERMODE(frame)) {
 			c->cpu_profile_pc = 0;
-			c->cpu_profile_upc = TRAPF_PC(frame);
+			c->cpu_profile_upc = CLKF_PC(frame);
 		} else {
-			c->cpu_profile_pc = TRAPF_PC(frame);
+			c->cpu_profile_pc = CLKF_PC(frame);
 			c->cpu_profile_upc = 0;
 		}