svn commit: r313573 - in head/sys: arm/arm arm/include contrib/vchiq/interface/compat

[Ian Lepore]

Author: ian
Date: Sat Feb 11 01:07:46 2017
New Revision: 313573
URL: https://svnweb.freebsd.org/changeset/base/313573

Log:
  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).

Modified:
  head/sys/arm/arm/identcpu-v4.c
  head/sys/arm/arm/identcpu-v6.c
  head/sys/arm/arm/stack_machdep.c
  head/sys/arm/include/atomic.h
  head/sys/contrib/vchiq/interface/compat/vchi_bsd.h

Modified: head/sys/arm/arm/identcpu-v4.c
==============================================================================
--- head/sys/arm/arm/identcpu-v4.c	Sat Feb 11 01:00:58 2017	(r313572)
+++ head/sys/arm/arm/identcpu-v4.c	Sat Feb 11 01:07:46 2017	(r313573)
@@ -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: head/sys/arm/arm/identcpu-v6.c
==============================================================================
--- head/sys/arm/arm/identcpu-v6.c	Sat Feb 11 01:00:58 2017	(r313572)
+++ head/sys/arm/arm/identcpu-v6.c	Sat Feb 11 01:07:46 2017	(r313573)
@@ -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: head/sys/arm/arm/stack_machdep.c
==============================================================================
--- head/sys/arm/arm/stack_machdep.c	Sat Feb 11 01:00:58 2017	(r313572)
+++ head/sys/arm/arm/stack_machdep.c	Sat Feb 11 01:07:46 2017	(r313573)
@@ -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: head/sys/arm/include/atomic.h
==============================================================================
--- head/sys/arm/include/atomic.h	Sat Feb 11 01:00:58 2017	(r313572)
+++ head/sys/arm/include/atomic.h	Sat Feb 11 01:07:46 2017	(r313573)
@@ -39,7 +39,6 @@
 #ifndef	_MACHINE_ATOMIC_H_
 #define	_MACHINE_ATOMIC_H_
 
-#include <sys/types.h>
 #include <machine/armreg.h>
 
 #ifndef _KERNEL

Modified: head/sys/contrib/vchiq/interface/compat/vchi_bsd.h
==============================================================================
--- head/sys/contrib/vchiq/interface/compat/vchi_bsd.h	Sat Feb 11 01:00:58 2017	(r313572)
+++ head/sys/contrib/vchiq/interface/compat/vchi_bsd.h	Sat Feb 11 01:07:46 2017	(r313573)
@@ -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>