From owner-svn-src-all@FreeBSD.ORG  Thu Jan  8 03:59:04 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE6D2CEC;
 Thu,  8 Jan 2015 03:59:04 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9AC30F2C;
 Thu,  8 Jan 2015 03:59:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t083x4iv007092;
 Thu, 8 Jan 2015 03:59:04 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t083x4Hr007091;
 Thu, 8 Jan 2015 03:59:04 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201501080359.t083x4Hr007091@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Thu, 8 Jan 2015 03:59:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276808 - head/sys/arm/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2015 03:59:04 -0000

Author: ian
Date: Thu Jan  8 03:59:03 2015
New Revision: 276808
URL: https://svnweb.freebsd.org/changeset/base/276808

Log:
  Move the inclusion of cpu-v6.h inside the #ifdef _KERNEL block, so that
  userland programs (which probably don't actually need machine/cpu.h) compile.

Modified:
  head/sys/arm/include/cpu.h

Modified: head/sys/arm/include/cpu.h
==============================================================================
--- head/sys/arm/include/cpu.h	Thu Jan  8 03:44:54 2015	(r276807)
+++ head/sys/arm/include/cpu.h	Thu Jan  8 03:59:03 2015	(r276808)
@@ -8,14 +8,13 @@
 #include <machine/armreg.h>
 #include <machine/frame.h>
 
-#if __ARM_ARCH >= 6
-#include <machine/cpu-v6.h>
-#endif
-
 void	cpu_halt(void);
 void	swi_vm(void *);
 
 #ifdef _KERNEL
+#if __ARM_ARCH >= 6
+#include <machine/cpu-v6.h>
+#endif
 static __inline uint64_t
 get_cyclecount(void)
 {