svn commit: r314530 - in stable/11/sys: arm/arm arm/include contrib/vchiq/interface/compat
Ian Lepore
ian at FreeBSD.org
Thu Mar 2 01:18:49 UTC 2017
Author: ian
Date: Thu Mar 2 01:18:46 2017
New Revision: 314530
URL: https://svnweb.freebsd.org/changeset/base/314530
Log:
MFC r312292, r313573:
Stop including sys/types.h from arm's machine/atomic.h, fix the places
where atomic.h was being included without ensuring that types.h (via
param.h) was included first, as required by atomic(9).
Remove arm's cpuconf.h, and references to it, after moving a few lines from
it into pmap-v4.h where they are used. Other than those few lines of
support for different MMU types, nothing in cpuconf.h has been used in our
code for quite a while.
The file existed to set up a variety of symbols to describe the
architecture. Over the past few years we have converted all of our source
to use the new architecture symbols standardized by ARM Inc, and predefined
by both clang and gcc.
Deleted:
stable/11/sys/arm/include/cpuconf.h
Modified:
stable/11/sys/arm/arm/bus_space_asm_generic.S
stable/11/sys/arm/arm/cpufunc.c
stable/11/sys/arm/arm/identcpu-v4.c
stable/11/sys/arm/arm/identcpu-v6.c
stable/11/sys/arm/arm/locore-v4.S
stable/11/sys/arm/arm/locore-v6.S
stable/11/sys/arm/arm/stack_machdep.c
stable/11/sys/arm/include/atomic.h
stable/11/sys/arm/include/cpufunc.h
stable/11/sys/arm/include/pcpu.h
stable/11/sys/arm/include/pmap-v4.h
stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/bus_space_asm_generic.S
==============================================================================
--- stable/11/sys/arm/arm/bus_space_asm_generic.S Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/bus_space_asm_generic.S Thu Mar 2 01:18:46 2017 (r314530)
@@ -36,7 +36,6 @@
*/
#include <machine/asm.h>
-#include <machine/cpuconf.h>
__FBSDID("$FreeBSD$");
/*
Modified: stable/11/sys/arm/arm/cpufunc.c
==============================================================================
--- stable/11/sys/arm/arm/cpufunc.c Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/cpufunc.c Thu Mar 2 01:18:46 2017 (r314530)
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/uma.h>
-#include <machine/cpuconf.h>
#include <machine/cpufunc.h>
#if defined(CPU_XSCALE_81342)
Modified: stable/11/sys/arm/arm/identcpu-v4.c
==============================================================================
--- stable/11/sys/arm/arm/identcpu-v4.c Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/identcpu-v4.c Thu Mar 2 01:18:46 2017 (r314530)
@@ -43,15 +43,14 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <machine/cpu.h>
#include <machine/endian.h>
-#include <machine/cpuconf.h>
#include <machine/md_var.h>
char machine[] = "arm";
Modified: stable/11/sys/arm/arm/identcpu-v6.c
==============================================================================
--- stable/11/sys/arm/arm/identcpu-v6.c Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/identcpu-v6.c Thu Mar 2 01:18:46 2017 (r314530)
@@ -43,8 +43,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
Modified: stable/11/sys/arm/arm/locore-v4.S
==============================================================================
--- stable/11/sys/arm/arm/locore-v4.S Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/locore-v4.S Thu Mar 2 01:18:46 2017 (r314530)
@@ -37,7 +37,6 @@
#include <sys/syscall.h>
#include <machine/asm.h>
#include <machine/armreg.h>
-#include <machine/cpuconf.h>
#include <machine/pte-v4.h>
__FBSDID("$FreeBSD$");
Modified: stable/11/sys/arm/arm/locore-v6.S
==============================================================================
--- stable/11/sys/arm/arm/locore-v6.S Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/locore-v6.S Thu Mar 2 01:18:46 2017 (r314530)
@@ -34,7 +34,6 @@
#include <machine/asmacros.h>
#include <machine/armreg.h>
#include <machine/sysreg.h>
-#include <machine/cpuconf.h>
#include <machine/pte-v6.h>
__FBSDID("$FreeBSD$");
Modified: stable/11/sys/arm/arm/stack_machdep.c
==============================================================================
--- stable/11/sys/arm/arm/stack_machdep.c Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/arm/stack_machdep.c Thu Mar 2 01:18:46 2017 (r314530)
@@ -27,8 +27,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/stack.h>
Modified: stable/11/sys/arm/include/atomic.h
==============================================================================
--- stable/11/sys/arm/include/atomic.h Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/include/atomic.h Thu Mar 2 01:18:46 2017 (r314530)
@@ -39,13 +39,10 @@
#ifndef _MACHINE_ATOMIC_H_
#define _MACHINE_ATOMIC_H_
-#include <sys/types.h>
#include <machine/armreg.h>
#ifndef _KERNEL
#include <machine/sysarch.h>
-#else
-#include <machine/cpuconf.h>
#endif
#if __ARM_ARCH >= 6
Modified: stable/11/sys/arm/include/cpufunc.h
==============================================================================
--- stable/11/sys/arm/include/cpufunc.h Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/include/cpufunc.h Thu Mar 2 01:18:46 2017 (r314530)
@@ -48,7 +48,6 @@
#include <sys/types.h>
#include <machine/armreg.h>
-#include <machine/cpuconf.h>
static __inline void
breakpoint(void)
Modified: stable/11/sys/arm/include/pcpu.h
==============================================================================
--- stable/11/sys/arm/include/pcpu.h Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/include/pcpu.h Thu Mar 2 01:18:46 2017 (r314530)
@@ -32,8 +32,6 @@
#ifdef _KERNEL
-#include <machine/cpuconf.h>
-
#include <sys/_lock.h>
#include <sys/_mutex.h>
Modified: stable/11/sys/arm/include/pmap-v4.h
==============================================================================
--- stable/11/sys/arm/include/pmap-v4.h Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/arm/include/pmap-v4.h Thu Mar 2 01:18:46 2017 (r314530)
@@ -51,7 +51,30 @@
#define _MACHINE_PMAP_V4_H_
#include <machine/pte-v4.h>
-#include <machine/cpuconf.h>
+
+/*
+ * Define the MMU types we support based on the cpu types. While the code has
+ * some theoretical support for multiple MMU types in a single kernel, there are
+ * no actual working configurations that use that feature.
+ */
+#if (defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_FA526))
+#define ARM_MMU_GENERIC 1
+#else
+#define ARM_MMU_GENERIC 0
+#endif
+
+#if (defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
+ defined(CPU_XSCALE_81342))
+#define ARM_MMU_XSCALE 1
+#else
+#define ARM_MMU_XSCALE 0
+#endif
+
+#define ARM_NMMUS (ARM_MMU_GENERIC + ARM_MMU_XSCALE)
+#if ARM_NMMUS == 0 && !defined(KLD_MODULE) && defined(_KERNEL)
+#error ARM_NMMUS is 0
+#endif
+
/*
* Pte related macros
*/
Modified: stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h
==============================================================================
--- stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h Thu Mar 2 01:14:48 2017 (r314529)
+++ stable/11/sys/contrib/vchiq/interface/compat/vchi_bsd.h Thu Mar 2 01:18:46 2017 (r314530)
@@ -28,8 +28,8 @@
#ifndef __VCHI_BSD_H__
#define __VCHI_BSD_H__
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/lock.h>
More information about the svn-src-all
mailing list