[src/trunk]: src/sys/arch sandpoint has its own module_init_md(). So, do not ...

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

details:   https://anonhg.NetBSD.org/src/rev/0df7659e694a
branches:  trunk
changeset: 378499:0df7659e694a
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Apr 15 00:04:07 2021 +0000

description:
sandpoint has its own module_init_md(). So, do not compile in
that function in powerpc_machdep.c.

diffstat:

 sys/arch/powerpc/powerpc/powerpc_machdep.c |  8 ++++----
 sys/arch/sandpoint/include/types.h         |  3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r fbc2006823ff -r 0df7659e694a sys/arch/powerpc/powerpc/powerpc_machdep.c
--- a/sys/arch/powerpc/powerpc/powerpc_machdep.c        Thu Apr 15 00:00:46 2021 +0000
+++ b/sys/arch/powerpc/powerpc/powerpc_machdep.c        Thu Apr 15 00:04:07 2021 +0000
@@ -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)
diff -r fbc2006823ff -r 0df7659e694a sys/arch/sandpoint/include/types.h
--- a/sys/arch/sandpoint/include/types.h        Thu Apr 15 00:00:46 2021 +0000
+++ b/sys/arch/sandpoint/include/types.h        Thu Apr 15 00:04:07 2021 +0000
@@ -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>