diff options
| author | marcel <marcel@FreeBSD.org> | 2011-10-04 16:55:53 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2011-10-04 16:55:53 +0000 |
| commit | ce883e6dec0a02a9403e7230d0e2c0c7f6e481b3 (patch) | |
| tree | c9e0275c338419142a5ff81c70433b9c78a8b75a /sys/arm | |
| parent | 82258d9cb3bf93428ff866f379e58aaaf841cae3 (diff) | |
| download | FreeBSD-src-ce883e6dec0a02a9403e7230d0e2c0c7f6e481b3.zip FreeBSD-src-ce883e6dec0a02a9403e7230d0e2c0c7f6e481b3.tar.gz | |
Include opt_* headers first. Otherwise we can end up with redefined
symbols.
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/elf_trampoline.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm/arm/elf_trampoline.c b/sys/arm/arm/elf_trampoline.c index 4adb025..945f653 100644 --- a/sys/arm/arm/elf_trampoline.c +++ b/sys/arm/arm/elf_trampoline.c @@ -22,6 +22,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Since we are compiled outside of the normal kernel build process, we + * need to include opt_global.h manually. + */ +#include "opt_global.h" +#include "opt_kernname.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); #include <machine/asm.h> @@ -33,13 +40,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpufunc.h> #include <machine/armreg.h> -/* - * Since we are compiled outside of the normal kernel build process, we - * need to include opt_global.h manually. - */ -#include "opt_global.h" -#include "opt_kernname.h" - extern char kernel_start[]; extern char kernel_end[]; |
