From owner-svn-src-head@FreeBSD.ORG  Wed Oct  9 00:22:21 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 936825E9;
 Wed,  9 Oct 2013 00:22:21 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 810452D06;
 Wed,  9 Oct 2013 00:22:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r990ML4j070319;
 Wed, 9 Oct 2013 00:22:21 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r990MLvh070318;
 Wed, 9 Oct 2013 00:22:21 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201310090022.r990MLvh070318@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 9 Oct 2013 00:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256171 - head/sys/mips/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Oct 2013 00:22:21 -0000

Author: adrian
Date: Wed Oct  9 00:22:21 2013
New Revision: 256171
URL: http://svnweb.freebsd.org/changeset/base/256171

Log:
  Shuffle the includes around so they occur after opt_global.h is included;
  this way the CPU ABI / core #define items are there.
  
  Reviewed by:	imp@
  Approved by:	re@ (gjb)

Modified:
  head/sys/mips/mips/elf_trampoline.c

Modified: head/sys/mips/mips/elf_trampoline.c
==============================================================================
--- head/sys/mips/mips/elf_trampoline.c	Wed Oct  9 00:21:21 2013	(r256170)
+++ head/sys/mips/mips/elf_trampoline.c	Wed Oct  9 00:22:21 2013	(r256171)
@@ -32,10 +32,6 @@ __FBSDID("$FreeBSD$");
 #else
 #include <sys/elf32.h>
 #endif
-#include <sys/inflate.h>
-#include <machine/elf.h>
-#include <machine/cpufunc.h>
-#include <machine/stdarg.h>
 
 /*
  * Since we are compiled outside of the normal kernel build process, we
@@ -43,6 +39,11 @@ __FBSDID("$FreeBSD$");
  */
 #include "opt_global.h"
 
+#include <sys/inflate.h>
+#include <machine/elf.h>
+#include <machine/cpufunc.h>
+#include <machine/stdarg.h>
+
 #ifndef KERNNAME
 #error Kernel name not provided
 #endif