From owner-p4-projects@FreeBSD.ORG  Mon Feb 23 20:32:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B5261065672; Mon, 23 Feb 2009 20:32:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B058106564A
	for <perforce@freebsd.org>; Mon, 23 Feb 2009 20:32:56 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4952E8FC17
	for <perforce@freebsd.org>; Mon, 23 Feb 2009 20:32:56 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NKWuh8010353
	for <perforce@freebsd.org>; Mon, 23 Feb 2009 20:32:56 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NKWuKM010351
	for perforce@freebsd.org; Mon, 23 Feb 2009 20:32:56 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Mon, 23 Feb 2009 20:32:56 GMT
Message-Id: <200902232032.n1NKWuKM010351@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 158150 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2009 20:32:57 -0000

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

Change 158150 by nwhitehorn@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);