PERFORCE change 158150 for review

Nathan Whitehorn nwhitehorn at FreeBSD.org
Mon Feb 23 12:32:57 PST 2009


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

Change 158150 by nwhitehorn at nwhitehorn_trantor on 2009/02/23 20:32:05

	Fix mismerge. We should use 'trapsize' not 'vectrapsize' now that
	vectrap is no longer with us.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#10 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#10 (text+ko) ====

@@ -421,7 +421,7 @@
 	bcopy(&trapcode, (void *)(EXC_SC + trap_offset),   (size_t)&trapsize);
 	bcopy(&trapcode, (void *)(EXC_TRC + trap_offset),  (size_t)&trapsize);
 	bcopy(&trapcode, (void *)(EXC_FPA + trap_offset),  (size_t)&trapsize);
-	bcopy(&trapcode, (void *)(EXC_VEC + trap_offset),  (size_t)&vectrapsize);
+	bcopy(&trapcode, (void *)(EXC_VEC + trap_offset),  (size_t)&trapsize);
 	bcopy(&trapcode, (void *)(EXC_VECAST + trap_offset), (size_t)&trapsize);
 	bcopy(&trapcode, (void *)(EXC_THRM + trap_offset), (size_t)&trapsize);
 	bcopy(&trapcode, (void *)(EXC_BPT + trap_offset),  (size_t)&trapsize);


More information about the p4-projects mailing list