Module Name: src
Committed By: chs
Date: Sat Jul 4 21:02:16 UTC 2020
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/share/mk: bsd.own.mk
src/sys/arch/x86/x86: x86_machdep.c
src/sys/modules/arch: archdirs.mk
Removed Files:
src/sys/modules/arch/x86/amd64-xen: Makefile bsd.amd64-xen.mk
src/sys/modules/arch/x86/i386pae-xen: Makefile bsd.i386pae-xen.mk
Log Message:
the x86 xen and non-xen modules are identical,
so remove the unneeded extra copies.
Xen kernels now use the same modules as native kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/modules/md.amd64 \
src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1199 -r1.1200 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/x86/x86/x86_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/arch/archdirs.mk
cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/x86/amd64-xen/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/x86/i386pae-xen/Makefile
cvs rdiff -u -r1.2 -r0 \
src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.86 src/distrib/sets/lists/modules/md.amd64:1.87
--- src/distrib/sets/lists/modules/md.amd64:1.86 Thu Mar 12 15:04:13 2020
+++ src/distrib/sets/lists/modules/md.amd64 Sat Jul 4 21:02:16 2020
@@ -1,7 +1,4 @@
-# $NetBSD: md.amd64,v 1.86 2020/03/12 15:04:13 pgoyette Exp $
-#
-# NOTE that there are two sets of files here:
-# @MODULEDIR@ and amd64-xen
+# $NetBSD: md.amd64,v 1.87 2020/07/04 21:02:16 chs Exp $
#
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.86 src/distrib/sets/lists/modules/md.i386:1.87
--- src/distrib/sets/lists/modules/md.i386:1.86 Sat Feb 29 18:46:12 2020
+++ src/distrib/sets/lists/modules/md.i386 Sat Jul 4 21:02:16 2020
@@ -1,8 +1,5 @@
-# $NetBSD: md.i386,v 1.86 2020/02/29 18:46:12 skrll Exp $
+# $NetBSD: md.i386,v 1.87 2020/07/04 21:02:16 chs Exp $
#
-# NOTE that there are two sets of files here: @MODULEDIR@ and i386pae-xen
-#
-
./@MODULEDIR@/acpiacad modules-base-kernel kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod
./@MODULEDIR@/acpibat modules-base-kernel kmod
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1199 src/share/mk/bsd.own.mk:1.1200
--- src/share/mk/bsd.own.mk:1.1199 Sat Jun 6 22:06:42 2020
+++ src/share/mk/bsd.own.mk Sat Jul 4 21:02:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1199 2020/06/06 22:06:42 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.1200 2020/07/04 21:02:16 chs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1006,8 +1006,7 @@ MKCOMPATTESTS:= no
MKCOMPATX11:= no
.endif
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
- || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
|| (${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc")
MKCOMPATMODULES?= yes
.else
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.143 src/sys/arch/x86/x86/x86_machdep.c:1.144
--- src/sys/arch/x86/x86/x86_machdep.c:1.143 Thu May 21 21:12:30 2020
+++ src/sys/arch/x86/x86/x86_machdep.c Sat Jul 4 21:02:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.143 2020/05/21 21:12:30 ad Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.144 2020/07/04 21:02:16 chs Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.143 2020/05/21 21:12:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.144 2020/07/04 21:02:16 chs Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -100,10 +100,6 @@ static char x86_cpu_idle_text[16];
#include <xen/xen.h>
#include <xen/hypervisor.h>
#endif
-#ifdef XENPV
-char module_machine_amd64_xen[] = "amd64-xen";
-char module_machine_i386pae_xen[] = "i386pae-xen";
-#endif
#ifndef XENPV
void (*delay_func)(unsigned int) = i8254_delay;
@@ -224,15 +220,6 @@ module_init_md(void)
struct btinfo_modulelist *biml;
struct bi_modulelist_entry *bi, *bimax;
- /* setup module path for XEN kernels */
-#ifdef XENPV
-#ifdef __x86_64__
- module_machine = module_machine_amd64_xen;
-#else
- module_machine = module_machine_i386pae_xen;
-#endif
-#endif
-
biml = lookup_bootinfo(BTINFO_MODULELIST);
if (biml == NULL) {
aprint_debug("No module info at boot\n");
Index: src/sys/modules/arch/archdirs.mk
diff -u src/sys/modules/arch/archdirs.mk:1.5 src/sys/modules/arch/archdirs.mk:1.6
--- src/sys/modules/arch/archdirs.mk:1.5 Sat Jun 27 06:50:00 2020
+++ src/sys/modules/arch/archdirs.mk Sat Jul 4 21:02:16 2020
@@ -1,15 +1,7 @@
-# $NetBSD: archdirs.mk,v 1.5 2020/06/27 06:50:00 rin Exp $
+# $NetBSD: archdirs.mk,v 1.6 2020/07/04 21:02:16 chs Exp $
# list of subdirs used per-platform
-.if ${MACHINE} == "amd64"
-ARCHDIR_SUBDIR= x86/amd64-xen
-.endif
-
-.if ${MACHINE} == "i386"
-ARCHDIR_SUBDIR= x86/i386pae-xen
-.endif
-
.if ${MACHINE_ARCH} == "powerpc"
ARCHDIR_SUBDIR= powerpc/powerpc-ibm4xx powerpc/powerpc-booke
.endif
