svn commit: r233635 - head/sys/powerpc/include

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu Mar 29 02:02:14 2012
New Revision: 233635
URL: http://svn.freebsd.org/changeset/base/233635

Log:
  Allow multiple inclusion of trap.h. This has always been broken, but
  until recently never caused problems.

Modified:
  head/sys/powerpc/include/trap.h
  head/sys/powerpc/include/trap_aim.h
  head/sys/powerpc/include/trap_booke.h

Modified: head/sys/powerpc/include/trap.h
==============================================================================
--- head/sys/powerpc/include/trap.h	Thu Mar 29 01:46:56 2012	(r233634)
+++ head/sys/powerpc/include/trap.h	Thu Mar 29 02:02:14 2012	(r233635)
@@ -6,7 +6,3 @@
 #include <machine/trap_booke.h>
 #endif
 
-#ifndef LOCORE
-struct trapframe;
-void    trap(struct trapframe *);
-#endif

Modified: head/sys/powerpc/include/trap_aim.h
==============================================================================
--- head/sys/powerpc/include/trap_aim.h	Thu Mar 29 01:46:56 2012	(r233634)
+++ head/sys/powerpc/include/trap_aim.h	Thu Mar 29 02:02:14 2012	(r233635)
@@ -119,4 +119,9 @@
 #define	EXC_PGM_PRIV		(1UL << 18)
 #define	EXC_PGM_TRAP		(1UL << 17)
 
+#ifndef LOCORE
+struct	trapframe;
+void    trap(struct trapframe *);
+#endif
+
 #endif	/* _POWERPC_TRAP_H_ */

Modified: head/sys/powerpc/include/trap_booke.h
==============================================================================
--- head/sys/powerpc/include/trap_booke.h	Thu Mar 29 01:46:56 2012	(r233634)
+++ head/sys/powerpc/include/trap_booke.h	Thu Mar 29 02:02:14 2012	(r233635)
@@ -52,4 +52,9 @@
 
 #define	EXC_LAST	255
 
+#ifndef LOCORE
+struct	trapframe;
+void    trap(struct trapframe *);
+#endif
+
 #endif	/* _POWERPC_TRAP_H_ */