Module Name: src
Committed By: rin
Date: Thu Apr 15 00:04:07 UTC 2021
Modified Files:
src/sys/arch/powerpc/powerpc: powerpc_machdep.c
src/sys/arch/sandpoint/include: types.h
Log Message:
sandpoint has its own module_init_md(). So, do not compile in
that function in powerpc_machdep.c.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/include/types.h
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/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.82 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.83
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.82 Sat Mar 6 08:32:17 2021
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Thu Apr 15 00:04:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.82 2021/03/06 08:32:17 rin Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.83 2021/04/15 00:04:07 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.82 2021/03/06 08:32:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.83 2021/04/15 00:04:07 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -820,7 +820,7 @@ emulate_mxmsr(struct lwp *l, struct trap
return 0;
}
-#ifdef MODULAR
+#if defined(MODULAR) && !defined(__PPC_HAVE_MODULE_INIT_MD)
/*
* Push any modules loaded by the boot loader.
*/
@@ -828,7 +828,7 @@ void
module_init_md(void)
{
}
-#endif /* MODULAR */
+#endif
bool
mm_md_direct_mapped_phys(paddr_t pa, vaddr_t *vap)
Index: src/sys/arch/sandpoint/include/types.h
diff -u src/sys/arch/sandpoint/include/types.h:1.9 src/sys/arch/sandpoint/include/types.h:1.10
--- src/sys/arch/sandpoint/include/types.h:1.9 Thu Apr 1 04:35:47 2021
+++ src/sys/arch/sandpoint/include/types.h Thu Apr 15 00:04:07 2021
@@ -1,6 +1,7 @@
-/* $NetBSD: types.h,v 1.9 2021/04/01 04:35:47 simonb Exp $ */
+/* $NetBSD: types.h,v 1.10 2021/04/15 00:04:07 rin Exp $ */
#define __HAVE_NEW_STYLE_BUS_H
+#define __PPC_HAVE_MODULE_INIT_MD
#include <powerpc/types.h>
