diff options
author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1999-10-28 04:28:04 +0000 |
---|---|---|
committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1999-10-28 04:28:04 +0000 |
commit | 2228b85adaf72bc8bd56e1d11b244c209978d4bb (patch) | |
tree | 5a308683780d8dfc82189edf2a7f927c2d0acb8a /sys/arch | |
parent | 23c4731f334c11b77c6bcf062ff2e7e6b3cf2c4e (diff) |
clean up a global pointer/array reference for OF_buf.
fix typo someone made.
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/powerpc/powerpc/machdep.c | 5 | ||||
-rw-r--r-- | sys/arch/powerpc/powerpc/opendev.c | 4 | ||||
-rw-r--r-- | sys/arch/powerpc/powerpc/openfirm.c | 7 | ||||
-rw-r--r-- | sys/arch/powerpc/powerpc/pmap.c | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c index 0dd8c717c33..e0ce2ab6f5d 100644 --- a/sys/arch/powerpc/powerpc/machdep.c +++ b/sys/arch/powerpc/powerpc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.25 1999/07/05 20:56:26 rahnds Exp $ */ +/* $OpenBSD: machdep.c,v 1.26 1999/10/28 04:28:03 rahnds Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -308,7 +308,6 @@ where = 3; */ consinit(); - printf("hello\n"); /* * Figure out ethernet address. */ @@ -810,6 +809,8 @@ boot(howto) #endif OF_exit(); (fw->boot)(str); + printf("boot failed, spinning\n"); + while(1) /* forever */; } /* diff --git a/sys/arch/powerpc/powerpc/opendev.c b/sys/arch/powerpc/powerpc/opendev.c index 3c745b9d05c..6cbd33ab6b3 100644 --- a/sys/arch/powerpc/powerpc/opendev.c +++ b/sys/arch/powerpc/powerpc/opendev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opendev.c,v 1.2 1999/07/05 20:56:26 rahnds Exp $ */ +/* $OpenBSD: opendev.c,v 1.3 1999/10/28 04:28:03 rahnds Exp $ */ /* $NetBSD: openfirm.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -38,8 +38,6 @@ #include <dev/ofw/openfirm.h> -extern char OF_buf[]; - extern void ofw_stack __P((void)); extern void ofbcopy __P((const void *, void *, size_t)); diff --git a/sys/arch/powerpc/powerpc/openfirm.c b/sys/arch/powerpc/powerpc/openfirm.c index 35404b377fa..5a4d9393887 100644 --- a/sys/arch/powerpc/powerpc/openfirm.c +++ b/sys/arch/powerpc/powerpc/openfirm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.c,v 1.4 1999/07/05 20:56:26 rahnds Exp $ */ +/* $OpenBSD: openfirm.c,v 1.5 1999/10/28 04:28:03 rahnds Exp $ */ /* $NetBSD: openfirm.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -36,9 +36,7 @@ #include <machine/psl.h> #include <machine/stdarg.h> -/*#include <dev/ofw/openfirm.h>*/ - -extern char OF_buf[]; +#include <dev/ofw/openfirm.h> extern void ofw_stack __P((void)); extern void ofbcopy __P((const void *, void *, size_t)); @@ -213,6 +211,7 @@ OF_exit() ofw_stack(); openfirmware(&args); panic ("OF_exit returned!"); /* just in case */ + while (1); } /* XXX What is the reason to have this instead of bcopy/memcpy? */ diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index 45a996e60d9..a70c9cee7b4 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.11 1999/09/03 18:01:50 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.12 1999/10/28 04:28:03 rahnds Exp $ */ /* $NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -956,7 +956,7 @@ pmap_remove_pv(pm, pteidx, va, pind, pte) * Insert physical page at pa into the given pmap at virtual address va. */ void -pmap_enter(pm, va, pa, prot, wired, acces_type) +pmap_enter(pm, va, pa, prot, wired, access_type) struct pmap *pm; vm_offset_t va, pa; vm_prot_t prot; |