diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2012-03-29 02:02:14 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2012-03-29 02:02:14 +0000 |
| commit | dc06a3cb59f5873dd81976e04661066e4412ca54 (patch) | |
| tree | 0927b7ba34798805412e69d612965f326117428b | |
| parent | 84886cd55f1c2109f1d05d832cbcbff2b34b9745 (diff) | |
| download | FreeBSD-src-dc06a3cb59f5873dd81976e04661066e4412ca54.zip FreeBSD-src-dc06a3cb59f5873dd81976e04661066e4412ca54.tar.gz | |
Allow multiple inclusion of trap.h. This has always been broken, but
until recently never caused problems.
| -rw-r--r-- | sys/powerpc/include/trap.h | 4 | ||||
| -rw-r--r-- | sys/powerpc/include/trap_aim.h | 5 | ||||
| -rw-r--r-- | sys/powerpc/include/trap_booke.h | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h index 271092a..61543b4 100644 --- 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 diff --git a/sys/powerpc/include/trap_aim.h b/sys/powerpc/include/trap_aim.h index afb77db..eb7322c 100644 --- 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_ */ diff --git a/sys/powerpc/include/trap_booke.h b/sys/powerpc/include/trap_booke.h index b6dbc64..b19fc33 100644 --- 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_ */ |
