Module Name: src
Committed By: chs
Date: Mon Oct 29 12:52:44 UTC 2012
Modified Files:
src/sys/arch/macppc/macppc: failsafe.c
src/sys/arch/powerpc/oea: ofw_consinit.c
Log Message:
fix compile problems (for POWERMAC_G5).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/macppc/failsafe.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/oea/ofw_consinit.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/macppc/macppc/failsafe.c
diff -u src/sys/arch/macppc/macppc/failsafe.c:1.2 src/sys/arch/macppc/macppc/failsafe.c:1.3
--- src/sys/arch/macppc/macppc/failsafe.c:1.2 Wed Aug 23 05:58:39 2006
+++ src/sys/arch/macppc/macppc/failsafe.c Mon Oct 29 12:52:43 2012
@@ -39,7 +39,9 @@
#include <sys/conf.h>
#include <dev/cons.h>
#include <sys/tty.h>
+
#include <powerpc/cpu.h>
+#include <machine/psl.h>
#if defined (PMAC_G5)
extern void mfhid4(volatile uint64_t * ret_hid4);
Index: src/sys/arch/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.14 src/sys/arch/powerpc/oea/ofw_consinit.c:1.15
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.14 Sat Oct 13 17:58:55 2012
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Mon Oct 29 12:52:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.14 2012/10/13 17:58:55 jdc Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.15 2012/10/29 12:52:43 chs Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.14 2012/10/13 17:58:55 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.15 2012/10/29 12:52:43 chs Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -150,6 +150,7 @@ cninit(void)
#ifdef PMAC_G5
/* The MMU hasn't been initialized yet, use failsafe for now */
+ extern struct consdev failsafe_cons;
cp = &failsafe_cons;
cn_tab = cp;
(*cp->cn_probe)(cp);
