From owner-svn-src-head@freebsd.org  Thu Mar  9 15:44:26 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73DDFD055A6;
 Thu,  9 Mar 2017 15:44:26 +0000 (UTC)
 (envelope-from dexuan@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 436D9B3B;
 Thu,  9 Mar 2017 15:44:26 +0000 (UTC)
 (envelope-from dexuan@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v29FiP1C020169;
 Thu, 9 Mar 2017 15:44:25 GMT (envelope-from dexuan@FreeBSD.org)
Received: (from dexuan@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29FiP4J020168;
 Thu, 9 Mar 2017 15:44:25 GMT (envelope-from dexuan@FreeBSD.org)
Message-Id: <201703091544.v29FiP4J020168@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dexuan set sender to
 dexuan@FreeBSD.org using -f
From: Dexuan Cui <dexuan@FreeBSD.org>
Date: Thu, 9 Mar 2017 15:44:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314962 - head/sys/boot/efi/loader
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2017 15:44:26 -0000

Author: dexuan
Date: Thu Mar  9 15:44:25 2017
New Revision: 314962
URL: https://svnweb.freebsd.org/changeset/base/314962

Log:
  loader.efi: only include the machine/ header files on x86
  
  The 2 files may not exist on other archs like aarch64 and hence we
  can have a build failure there.
  
  Reported by:	lwhsu
  MFC after:	2 weeks
  Sponsored by:	Microsoft

Modified:
  head/sys/boot/efi/loader/copy.c

Modified: head/sys/boot/efi/loader/copy.c
==============================================================================
--- head/sys/boot/efi/loader/copy.c	Thu Mar  9 15:21:03 2017	(r314961)
+++ head/sys/boot/efi/loader/copy.c	Thu Mar  9 15:44:25 2017	(r314962)
@@ -30,8 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <machine/cpufunc.h>
-#include <machine/specialreg.h>
 
 #include <stand.h>
 #include <bootstrap.h>
@@ -42,6 +40,8 @@ __FBSDID("$FreeBSD$");
 #include "loader_efi.h"
 
 #if defined(__i386__) || defined(__amd64__)
+#include <machine/cpufunc.h>
+#include <machine/specialreg.h>
 
 /*
  * The code is excerpted from sys/x86/x86/identcpu.c: identify_cpu(),