Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mvmeppc/mvmeppc Fix a mem_region botch:



details:   https://anonhg.NetBSD.org/src/rev/f9fa60989601
branches:  trunk
changeset: 533986:f9fa60989601
user:      scw <scw%NetBSD.org@localhost>
date:      Thu Jul 11 21:50:22 2002 +0000

description:
Fix a mem_region botch:
physmemr and availmemr both need to be arrays, where the last element
has `size' set to zero to act as a terminator.

diffstat:

 sys/arch/mvmeppc/mvmeppc/machdep.c |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 52984bef6a54 -r f9fa60989601 sys/arch/mvmeppc/mvmeppc/machdep.c
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c        Thu Jul 11 21:46:21 2002 +0000
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c        Thu Jul 11 21:50:22 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.4 2002/07/05 18:45:18 matt Exp $ */
+/*     $NetBSD: machdep.c,v 1.5 2002/07/11 21:50:22 scw Exp $  */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -113,7 +113,7 @@
 
 vaddr_t mvmeppc_intr_reg;      /* PReP-compatible  interrupt vector register */
 
-struct mem_region physmemr, availmemr;
+struct mem_region physmemr[2], availmemr[2];
 
 paddr_t avail_end;                     /* XXX temporary */
 
@@ -149,11 +149,11 @@
        /*
         * Set memory region
         */
-       physmemr.start = 0;
-       physmemr.size = bootinfo.bi_memsize & ~PGOFSET;
-       availmemr.start = (endkernel + PGOFSET) & ~PGOFSET;
-       availmemr.size = bootinfo.bi_memsize - availmemr.start;
-       avail_end = physmemr.start + physmemr.size;    /* XXX temporary */
+       physmemr[0].start = 0;
+       physmemr[0].size = bootinfo.bi_memsize & ~PGOFSET;
+       availmemr[0].start = (endkernel + PGOFSET) & ~PGOFSET;
+       availmemr[0].size = bootinfo.bi_memsize - availmemr[0].start;
+       avail_end = physmemr[0].start + physmemr[0].size;    /* XXX temporary */
 
        /*
         * Set CPU clock
@@ -209,8 +209,8 @@
        struct mem_region **mem, **avail;
 {
 
-       *mem = &physmemr;
-       *avail = &availmemr;
+       *mem = physmemr;
+       *avail = availmemr;
 }
 
 /*



Home | Main Index | Thread Index | Old Index