Module Name: src
Committed By: pgoyette
Date: Mon Mar 26 10:49:45 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: Makefile compat_60_mod.c
src/sys/modules/arch/x86/amd64-xen [pgoyette-compat]: bsd.amd64-xen.mk
src/sys/modules/arch/x86/i386-xen [pgoyette-compat]: bsd.i386-xen.mk
src/sys/modules/arch/x86/i386pae-xen [pgoyette-compat]:
bsd.i386pae-xen.mk
src/sys/modules/compat_60 [pgoyette-compat]: Makefile
Log Message:
For now, disable CPU_UCODE stuff since we can't build it properly
with XEN. Re-enable it after we get fix for PR kern/53130
To generate a diff of this commit:
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/compat/common/Makefile
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1 -r1.1.28.1 \
src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
cvs rdiff -u -r1.1 -r1.1.28.1 \
src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk
cvs rdiff -u -r1.1 -r1.1.28.1 \
src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/modules/compat_60/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/Makefile
diff -u src/sys/compat/common/Makefile:1.63.2.1 src/sys/compat/common/Makefile:1.63.2.2
--- src/sys/compat/common/Makefile:1.63.2.1 Sun Mar 18 02:05:21 2018
+++ src/sys/compat/common/Makefile Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63.2.1 2018/03/18 02:05:21 pgoyette Exp $
+# $NetBSD: Makefile,v 1.63.2.2 2018/03/26 10:49:45 pgoyette Exp $
LIB= compat
NOPIC= # defined
@@ -33,9 +33,11 @@ lib${LIB}.po:: ${POBJS:O}
@rm -f lib${LIB}.po
@${LD} -r -o lib${LIB}.po ${LDFLAGS} `NM=${NM} ${LORDER} ${POBJS} | ${TSORT}`
+.if NOTYET
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DCPU_UCODE
.endif
+.endif
showsources: ${SRCS}
@echo ${.ALLSRC}
Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.13 src/sys/compat/common/compat_60_mod.c:1.1.2.14
--- src/sys/compat/common/compat_60_mod.c:1.1.2.13 Sat Mar 24 08:11:12 2018
+++ src/sys/compat/common/compat_60_mod.c Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_60_mod.c,v 1.1.2.13 2018/03/24 08:11:12 pgoyette Exp $ */
+/* $NetBSD: compat_60_mod.c,v 1.1.2.14 2018/03/26 10:49:45 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.13 2018/03/24 08:11:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.14 2018/03/26 10:49:45 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -78,9 +78,11 @@ compat_60_fini(void)
{
int error = 0;
+#ifdef NOTYET
#ifdef CPU_UCODE
kern_cpu_60_fini();
#endif
+#endif
ccd_60_fini();
kern_tty_60_fini();
@@ -89,9 +91,11 @@ compat_60_fini(void)
if (error != 0) {
kern_tty_60_init();
ccd_60_init();
+#ifdef NOTYET
#ifdef CPU_UCODE
kern_cpu_60_init();
#endif
+#endif
return error;
}
@@ -100,9 +104,11 @@ compat_60_fini(void)
kern_sa_60_init();
kern_tty_60_init();
ccd_60_init();
+#ifdef NOTYET
#ifdef CPU_UCODE
kern_cpu_60_init();
#endif
+#endif
return error;
}
Index: src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
diff -u src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1 src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1.28.1
--- src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk:1.1 Mon Aug 11 03:43:25 2014
+++ src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.amd64-xen.mk,v 1.1 2014/08/11 03:43:25 jnemeth Exp $
+# $NetBSD: bsd.amd64-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $
.ifndef _BSD_AMD64_XEN_MK_
_BSD_AMD64_XEN_MK_=1
@@ -7,4 +7,6 @@ KMODULEARCHDIR:= amd64-xen
XEN= 1
+CPPFLAGS+= -DXEN
+
.endif # _BSD_AMD64_XEN_MK_
Index: src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk
diff -u src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1 src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1.28.1
--- src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk:1.1 Mon Aug 11 03:43:26 2014
+++ src/sys/modules/arch/x86/i386-xen/bsd.i386-xen.mk Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386-xen.mk,v 1.1 2014/08/11 03:43:26 jnemeth Exp $
+# $NetBSD: bsd.i386-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $
.ifndef _BSD_I386_XEN_MK_
_BSD_I386_XEN_MK_=1
@@ -7,4 +7,6 @@ KMODULEARCHDIR:= i386-xen
XEN= 1
+CPPFLAGS+= -DXEN
+
.endif # _BSD_I386_XEN_MK_
Index: src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
diff -u src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1 src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1.28.1
--- src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk:1.1 Mon Aug 11 03:43:26 2014
+++ src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386pae-xen.mk,v 1.1 2014/08/11 03:43:26 jnemeth Exp $
+# $NetBSD: bsd.i386pae-xen.mk,v 1.1.28.1 2018/03/26 10:49:45 pgoyette Exp $
.ifndef _BSD_I386PAE_XEN_MK_
_BSD_I386PAE_XEN_MK_=1
@@ -8,4 +8,6 @@ KMODULEARCHDIR:= i386pae-xen
XEN= 1
PAE= 1
+CPPFLAGS+= -DPAE -DXEN
+
.endif # _BSD_I386PAE_XEN_MK_
Index: src/sys/modules/compat_60/Makefile
diff -u src/sys/modules/compat_60/Makefile:1.1.2.11 src/sys/modules/compat_60/Makefile:1.1.2.12
--- src/sys/modules/compat_60/Makefile:1.1.2.11 Sun Mar 25 10:38:51 2018
+++ src/sys/modules/compat_60/Makefile Mon Mar 26 10:49:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.11 2018/03/25 10:38:51 pgoyette Exp $
+# $NetBSD: Makefile,v 1.1.2.12 2018/03/26 10:49:45 pgoyette Exp $
.include "../Makefile.inc"
@@ -11,11 +11,13 @@ CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOM
SRCS+= compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
kern_cpu_60.c
+.if NOTYET
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DCPU_UCODE
.PATH: ${S}/arch/x86/x86
SRCS+= compat_60_cpu_ucode.c
.endif
+.endif
.include <bsd.kmodule.mk>
