From owner-p4-projects@FreeBSD.ORG  Wed Jan  9 06:50:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D83116A41B; Wed,  9 Jan 2008 06:50:02 +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 1327316A418
	for <perforce@freebsd.org>; Wed,  9 Jan 2008 06:50:02 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E28A713C447
	for <perforce@freebsd.org>; Wed,  9 Jan 2008 06:50:01 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m096o1Lm068863
	for <perforce@freebsd.org>; Wed, 9 Jan 2008 06:50:01 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m096o1cs068843
	for perforce@freebsd.org; Wed, 9 Jan 2008 06:50:01 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 9 Jan 2008 06:50:01 GMT
Message-Id: <200801090650.m096o1cs068843@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132855 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: Wed, 09 Jan 2008 06:50:02 -0000

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

Change 132855 by imp@imp_lighthouse on 2008/01/09 06:49:37

	The aim powerpc stuff still uses trap.  I'm not sure if these
	declarations should be here, or in trap_aim.h, but I'll keep
	them here since it just seems less wrong.
	
	This is needed for GENERIC compilation (at least without
	modules).  If this is done 'wrong' feel free to point me in the
	right direction or do whatever else gets GENERIC compiling.

Affected files ...

.. //depot/projects/e500/sys/powerpc/include/trap.h#4 edit

Differences ...

==== //depot/projects/e500/sys/powerpc/include/trap.h#4 (text+ko) ====

@@ -110,12 +110,11 @@
 #define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f)   /* source or target */
 #define EXC_ALI_RA(dsisr) (dsisr & 0x1f)
 
+#endif	/* _POWERPC_TRAP_H_ */
+
+#endif /* if 0 commenting all the above out */
+
 #ifndef LOCORE
-
 struct trapframe;
 void    trap(struct trapframe *);
-
-#endif
-
-#endif	/* _POWERPC_TRAP_H_ */
 #endif