[src/trunk]: src/sys/arch Reduce diff between i386/i386/genassym.cf and amd64...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf9edfe13363
branches:  trunk
changeset: 372791:cf9edfe13363
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Dec 26 15:52:37 2022 +0000

description:
Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI.

diffstat:

 sys/arch/amd64/amd64/genassym.cf |  13 +++++++------
 sys/arch/i386/i386/genassym.cf   |  28 +++++++++++++---------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diffs (102 lines):

diff -r abf9aa81bfa9 -r cf9edfe13363 sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf  Mon Dec 26 09:39:29 2022 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf  Mon Dec 26 15:52:37 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.91 2022/12/26 09:39:30 msaitoh Exp $
+#      $NetBSD: genassym.cf,v 1.92 2022/12/26 15:52:37 msaitoh Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,6 +69,11 @@
 include "opt_xen.h"
 endif
 
+if defined(_KERNEL) && defined(_KERNEL_OPT)
+include "isa.h"
+include "ioapic.h"
+endif
+
 quote #define __MUTEX_PRIVATE
 quote #define __RWLOCK_PRIVATE
 
@@ -107,10 +112,6 @@
 include <machine/linux32_machdep.h>
 endif
 
-if defined(_KERNEL) && defined(_KERNEL_OPT)
-include "isa.h"
-include "ioapic.h"
-endif
 if NISA > 0
 include <machine/isa_machdep.h>
 endif
@@ -123,7 +124,7 @@
 ifdef XEN
 include <xen/include/public/xen.h>
 include <xen/include/public/arch-x86/hvm/start_info.h>
-endif  
+endif
 
 include <sys/bus.h>
 
diff -r abf9aa81bfa9 -r cf9edfe13363 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Mon Dec 26 09:39:29 2022 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Mon Dec 26 15:52:37 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.129 2022/12/26 09:39:29 msaitoh Exp $
+#      $NetBSD: genassym.cf,v 1.130 2022/12/26 15:52:37 msaitoh Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,6 +70,11 @@
 include "opt_xen.h"
 endif
 
+if defined(_KERNEL) && defined(_KERNEL_OPT)
+include "isa.h"
+include "ioapic.h"
+endif
+
 quote #define __MUTEX_PRIVATE
 quote #define __RWLOCK_PRIVATE
 
@@ -98,15 +103,6 @@
 include <machine/types.h>
 include <machine/segments.h>
 
-ifdef XEN
-include <xen/include/public/sched.h>
-include <xen/include/public/arch-x86/hvm/start_info.h>
-endif
-
-if defined(_KERNEL) && defined(_KERNEL_OPT)
-include "ioapic.h"
-endif
-
 include <compat/sys/signal.h>
 
 ifdef COMPAT_LINUX
@@ -118,16 +114,18 @@
 include <compat/freebsd/freebsd_machdep.h>
 endif
 
+if NISA > 0
+include <machine/isa_machdep.h>
+endif
+
 if NIOAPIC > 0
 include <machine/i82093reg.h>
 include <machine/i82093var.h>
 endif
 
-if defined(_KERNEL) && defined(_KERNEL_OPT)
-include "isa.h"
-endif
-if NISA > 0
-include <machine/isa_machdep.h>
+ifdef XEN
+include <xen/include/public/sched.h>
+include <xen/include/public/arch-x86/hvm/start_info.h>
 endif
 
 include <sys/bus.h>