Module Name: src Committed By: msaitoh Date: Mon Dec 26 15:52:37 UTC 2022
Modified Files: src/sys/arch/amd64/amd64: genassym.cf src/sys/arch/i386/i386: genassym.cf Log Message: Reduce diff between i386/i386/genassym.cf and amd64/amd64/genassym.cf. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amd64/amd64/genassym.cf cvs rdiff -u -r1.129 -r1.130 src/sys/arch/i386/i386/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/amd64/amd64/genassym.cf diff -u src/sys/arch/amd64/amd64/genassym.cf:1.91 src/sys/arch/amd64/amd64/genassym.cf:1.92 --- src/sys/arch/amd64/amd64/genassym.cf:1.91 Mon Dec 26 09:39:30 2022 +++ src/sys/arch/amd64/amd64/genassym.cf Mon Dec 26 15:52:37 2022 @@ -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_compat_linux32.h" 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 @@ if defined(COMPAT_LINUX32) 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 @@ endif ifdef XEN include <xen/include/public/xen.h> include <xen/include/public/arch-x86/hvm/start_info.h> -endif +endif include <sys/bus.h> Index: src/sys/arch/i386/i386/genassym.cf diff -u src/sys/arch/i386/i386/genassym.cf:1.129 src/sys/arch/i386/i386/genassym.cf:1.130 --- src/sys/arch/i386/i386/genassym.cf:1.129 Mon Dec 26 09:39:29 2022 +++ src/sys/arch/i386/i386/genassym.cf Mon Dec 26 15:52:37 2022 @@ -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_compat_netbsd.h" 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/intr.h> 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 @@ ifdef COMPAT_FREEBSD 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>