Author: marius Date: Sun Jun 3 11:54:26 2012 New Revision: 236511 URL: http://svn.freebsd.org/changeset/base/236511
Log: MFC: r233635 Allow multiple inclusion of trap.h. This has always been broken, but until recently never caused problems. Modified: stable/9/sys/powerpc/include/trap.h stable/9/sys/powerpc/include/trap_aim.h stable/9/sys/powerpc/include/trap_booke.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/powerpc/include/trap.h ============================================================================== --- stable/9/sys/powerpc/include/trap.h Sun Jun 3 11:31:45 2012 (r236510) +++ stable/9/sys/powerpc/include/trap.h Sun Jun 3 11:54:26 2012 (r236511) @@ -6,7 +6,3 @@ #include <machine/trap_booke.h> #endif -#ifndef LOCORE -struct trapframe; -void trap(struct trapframe *); -#endif Modified: stable/9/sys/powerpc/include/trap_aim.h ============================================================================== --- stable/9/sys/powerpc/include/trap_aim.h Sun Jun 3 11:31:45 2012 (r236510) +++ stable/9/sys/powerpc/include/trap_aim.h Sun Jun 3 11:54:26 2012 (r236511) @@ -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: stable/9/sys/powerpc/include/trap_booke.h ============================================================================== --- stable/9/sys/powerpc/include/trap_booke.h Sun Jun 3 11:31:45 2012 (r236510) +++ stable/9/sys/powerpc/include/trap_booke.h Sun Jun 3 11:54:26 2012 (r236511) @@ -52,4 +52,9 @@ #define EXC_LAST 255 +#ifndef LOCORE +struct trapframe; +void trap(struct trapframe *); +#endif + #endif /* _POWERPC_TRAP_H_ */ _______________________________________________ svn-src-stable-9@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
