diff options
author | ian <ian@FreeBSD.org> | 2017-03-02 01:18:46 +0000 |
---|---|---|
committer | Luiz Souza <luiz@netgate.com> | 2017-05-08 16:13:11 -0500 |
commit | a9c711775c975543fa3184ee89e77166266cf29c (patch) | |
tree | 70014ff2f53292bd1aecc6caf3bfcd0f864a49bb /sys/contrib/vchiq | |
parent | d88ac9e9cec70d8b63d453117591fd6149681d34 (diff) | |
download | FreeBSD-src-a9c711775c975543fa3184ee89e77166266cf29c.zip FreeBSD-src-a9c711775c975543fa3184ee89e77166266cf29c.tar.gz |
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.
(cherry picked from commit acd168923c104fa26f6d48db142fa778b5cbc7b1)
Diffstat (limited to 'sys/contrib/vchiq')
-rw-r--r-- | sys/contrib/vchiq/interface/compat/vchi_bsd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/vchiq/interface/compat/vchi_bsd.h b/sys/contrib/vchiq/interface/compat/vchi_bsd.h index d2991a9..107041a 100644 --- a/sys/contrib/vchiq/interface/compat/vchi_bsd.h +++ b/sys/contrib/vchiq/interface/compat/vchi_bsd.h @@ -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> |