Module Name: src
Committed By: skrll
Date: Sun Nov 24 11:23:16 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: genassym.cf
src/sys/arch/arm/arm32: genassym.cf
Log Message:
corect #include order
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/genassym.cf
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/arm/arm32/genassym.cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/genassym.cf
diff -u src/sys/arch/aarch64/aarch64/genassym.cf:1.14 src/sys/arch/aarch64/aarch64/genassym.cf:1.15
--- src/sys/arch/aarch64/aarch64/genassym.cf:1.14 Sat Sep 7 11:15:25 2019
+++ src/sys/arch/aarch64/aarch64/genassym.cf Sun Nov 24 11:23:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.14 2019/09/07 11:15:25 ryo Exp $
+# $NetBSD: genassym.cf,v 1.15 2019/11/24 11:23:16 skrll Exp $
#-
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -28,6 +28,12 @@
# POSSIBILITY OF SUCH DAMAGE.
#-
+if defined(_KERNEL_OPT)
+include "opt_multiprocessor.h"
+include "opt_compat_netbsd.h"
+include "opt_execfmt.h"
+endif
+
include <sys/param.h>
include <sys/systm.h>
include <sys/bitops.h>
@@ -52,12 +58,6 @@ include <aarch64/frame.h>
include <aarch64/armreg.h>
include <aarch64/pte.h>
-if defined(_KERNEL_OPT)
-include "opt_multiprocessor.h"
-include "opt_compat_netbsd.h"
-include "opt_execfmt.h"
-endif
-
define __HAVE_FAST_SOFTINTS 1
#ifdef __HAVE_PIC_FAST_SOFTINTS
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.81 src/sys/arch/arm/arm32/genassym.cf:1.82
--- src/sys/arch/arm/arm32/genassym.cf:1.81 Sat Nov 23 19:40:34 2019
+++ src/sys/arch/arm/arm32/genassym.cf Sun Nov 24 11:23:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.81 2019/11/23 19:40:34 ad Exp $
+# $NetBSD: genassym.cf,v 1.82 2019/11/24 11:23:16 skrll Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -30,6 +30,12 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
+if defined(_KERNEL_OPT)
+include "opt_multiprocessor.h"
+include "opt_compat_netbsd.h"
+include "opt_execfmt.h"
+endif
+
include <sys/param.h>
include <sys/systm.h>
include <sys/mbuf.h>
@@ -55,12 +61,6 @@ include <machine/pmap.h>
include <machine/pcb.h>
include <machine/vmparam.h>
-if defined(_KERNEL_OPT)
-include "opt_multiprocessor.h"
-include "opt_compat_netbsd.h"
-include "opt_execfmt.h"
-endif
-
define __PROG32 1
ifdef __ARM_FIQ_INDIRECT
define __ARM_FIQ_INDIRECT 1
