Allow multiple inclusion of trap.h. This has always been broken, but

until recently never caused problems.
2012-03-29 02:02:14 +00:00 · 2012-03-29 02:02:14 +00:00 · dc06a3cb59
commit dc06a3cb59
parent 84886cd55f
3 changed files with 10 additions and 4 deletions
--- a/sys/powerpc/include/trap.h
+++ b/sys/powerpc/include/trap.h
@ -6,7 +6,3 @@
 #include <machine/trap_booke.h>
 #endif

-#ifndef LOCORE
-struct trapframe;
-void    trap(struct trapframe *);
-#endif
--- a/sys/powerpc/include/trap_aim.h
+++ b/sys/powerpc/include/trap_aim.h
@ -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_ */
--- a/sys/powerpc/include/trap_booke.h
+++ b/sys/powerpc/include/trap_booke.h
@ -52,4 +52,9 @@

 #define	EXC_LAST	255

+#ifndef LOCORE
+struct	trapframe;
+void    trap(struct trapframe *);
+#endif
+
 #endif	/* _POWERPC_TRAP_H_ */