Module Name: src
Committed By: jmmv
Date: Mon Jan 18 23:35:51 UTC 2010
Modified Files:
src/sys/arch/powerpc/powerpc: kobj_machdep.c powerpc_machdep.c
Log Message:
Define kobj_machdep and module_init_md empty functions so that powerpc
kernels (at least macppc) with 'options MODULAR' can be built.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/powerpc/kobj_machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
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/kobj_machdep.c
diff -u src/sys/arch/powerpc/powerpc/kobj_machdep.c:1.2 src/sys/arch/powerpc/powerpc/kobj_machdep.c:1.3
--- src/sys/arch/powerpc/powerpc/kobj_machdep.c:1.2 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/powerpc/kobj_machdep.c Mon Jan 18 23:35:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.2 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.3 2010/01/18 23:35:51 jmmv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.2 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.3 2010/01/18 23:35:51 jmmv Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -141,3 +141,10 @@
return 0;
}
+
+int
+kobj_machdep(kobj_t ko, void *base, size_t size, bool load)
+{
+
+ return 0;
+}
Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.41 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.42
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.41 Thu Dec 10 14:13:51 2009
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Mon Jan 18 23:35:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.41 2009/12/10 14:13:51 matt Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.42 2010/01/18 23:35:51 jmmv Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,9 +32,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.41 2009/12/10 14:13:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.42 2010/01/18 23:35:51 jmmv Exp $");
#include "opt_altivec.h"
+#include "opt_modular.h"
#include <sys/param.h>
#include <sys/conf.h>
@@ -48,6 +49,7 @@
#include <sys/sysctl.h>
#include <sys/ucontext.h>
#include <sys/cpu.h>
+#include <sys/module.h>
int cpu_timebase;
int cpu_printfataltraps;
@@ -301,3 +303,12 @@
return curcpu()->ci_idepth != 0;
}
+#ifdef MODULAR
+/*
+ * Push any modules loaded by the boot loader.
+ */
+void
+module_init_md(void)
+{
+}
+#endif /* MODULAR */
