Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch fix compile problems (for POWERMAC_G5).



details:   https://anonhg.NetBSD.org/src/rev/91b4554e78d5
branches:  trunk
changeset: 782339:91b4554e78d5
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Oct 29 12:52:43 2012 +0000

description:
fix compile problems (for POWERMAC_G5).

diffstat:

 sys/arch/macppc/macppc/failsafe.c   |  2 ++
 sys/arch/powerpc/oea/ofw_consinit.c |  5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 400115a0d1c6 -r 91b4554e78d5 sys/arch/macppc/macppc/failsafe.c
--- a/sys/arch/macppc/macppc/failsafe.c Mon Oct 29 12:51:38 2012 +0000
+++ b/sys/arch/macppc/macppc/failsafe.c Mon Oct 29 12:52:43 2012 +0000
@@ -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);
diff -r 400115a0d1c6 -r 91b4554e78d5 sys/arch/powerpc/oea/ofw_consinit.c
--- a/sys/arch/powerpc/oea/ofw_consinit.c       Mon Oct 29 12:51:38 2012 +0000
+++ b/sys/arch/powerpc/oea/ofw_consinit.c       Mon Oct 29 12:52:43 2012 +0000
@@ -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 @@
 
 #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);



Home | Main Index | Thread Index | Old Index