Date: Tue, 4 Oct 2011 16:55:53 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225990 - head/sys/arm/arm Message-ID: <201110041655.p94GtrjG067136@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Tue Oct 4 16:55:53 2011 New Revision: 225990 URL: http://svn.freebsd.org/changeset/base/225990 Log: Include opt_* headers first. Otherwise we can end up with redefined symbols. Modified: head/sys/arm/arm/elf_trampoline.c Modified: head/sys/arm/arm/elf_trampoline.c ============================================================================== --- head/sys/arm/arm/elf_trampoline.c Tue Oct 4 16:54:21 2011 (r225989) +++ head/sys/arm/arm/elf_trampoline.c Tue Oct 4 16:55:53 2011 (r225990) @@ -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[];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110041655.p94GtrjG067136>