Module Name: src
Committed By: mrg
Date: Sun Jun 12 04:20:18 UTC 2011
Modified Files:
src/sys/arch/evbppc/evbppc: evbppc_machdep.c
src/sys/arch/evbppc/mpc85xx: machdep.c
Log Message:
move module_machine_booke into the booke machdep.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/evbppc/evbppc_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/mpc85xx/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/evbppc/evbppc/evbppc_machdep.c
diff -u src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.10 src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.11
--- src/sys/arch/evbppc/evbppc/evbppc_machdep.c:1.10 Sun Jun 12 03:42:41 2011
+++ src/sys/arch/evbppc/evbppc/evbppc_machdep.c Sun Jun 12 04:20:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evbppc_machdep.c,v 1.10 2011/06/12 03:42:41 mrg Exp $ */
+/* $NetBSD: evbppc_machdep.c,v 1.11 2011/06/12 04:20:18 mrg Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.10 2011/06/12 03:42:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.11 2011/06/12 04:20:18 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,10 +81,9 @@
#include <machine/pmap.h>
/*
- * ibm4xx/booke kernels need to set module_machine to this for modules to work.
+ * ibm4xx kernels need to set module_machine to this for modules to work.
*/
char module_machine_ibm4xx[] = "powerpc-ibm4xx";
-char module_machine_booke[] = "powerpc-booke";
int fake_mapiodev = 1;
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.8 src/sys/arch/evbppc/mpc85xx/machdep.c:1.9
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.8 Sun Jun 12 03:42:41 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Sun Jun 12 04:20:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.8 2011/06/12 03:42:41 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.9 2011/06/12 04:20:18 mrg Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -93,6 +93,11 @@
#include <evbppc/mpc85xx/pixisreg.h>
#endif
+/*
+ * booke kernels need to set module_machine to this for modules to work.
+ */
+char module_machine_booke[] = "powerpc-booke";
+
void initppc(vaddr_t, vaddr_t);
#define MEMREGIONS 4
