Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jun 2015 13:58:41 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r284265 - head/sys/arm/include
Message-ID:  <201506111358.t5BDwfsD080022@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andrew
Date: Thu Jun 11 13:58:40 2015
New Revision: 284265
URL: https://svnweb.freebsd.org/changeset/base/284265

Log:
  Stop using VFP in pcpu.h when we mean ARMv6 and later.

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

Modified: head/sys/arm/include/pcpu.h
==============================================================================
--- head/sys/arm/include/pcpu.h	Thu Jun 11 13:54:18 2015	(r284264)
+++ head/sys/arm/include/pcpu.h	Thu Jun 11 13:58:40 2015	(r284265)
@@ -32,6 +32,7 @@
 
 #ifdef _KERNEL
 
+#include <machine/acle-compat.h>
 #include <machine/cpuconf.h>
 
 #define	ALT_STACK_SIZE	128
@@ -40,7 +41,7 @@ struct vmspace;
 
 #endif	/* _KERNEL */
 
-#ifdef VFP
+#if __ARM_ARCH >= 6
 #define PCPU_MD_FIELDS							\
 	unsigned int pc_vfpsid;						\
 	unsigned int pc_vfpmvfr0;					\
@@ -58,9 +59,8 @@ struct pcb;
 struct pcpu;
 
 extern struct pcpu *pcpup;
-#if ARM_ARCH_6 || ARM_ARCH_7A
-/* or ARM_TP_ADDRESS 	mark REMOVE ME NOTE */
 
+#if __ARM_ARCH >= 6
 #define CPU_MASK (0xf)
 
 #ifndef SMP



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506111358.t5BDwfsD080022>