svn commit: r225990 - head/sys/arm/arm
Marcel Moolenaar
marcel at FreeBSD.org
Tue Oct 4 16:55:53 UTC 2011
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[];
More information about the svn-src-head
mailing list