diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2015-07-15 23:07:24 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2015-07-15 23:07:24 +0000 |
| commit | b67a0bee64f0777c2caf02893881804624c9da2f (patch) | |
| tree | 1e360a9ea05ecf94fc908b1953d226832089878a | |
| parent | 4dc35b48dc1c78f151b12012649fd013ceb2fa17 (diff) | |
Refix memory handling for machines with less than 256M broken by revision 1.64.
Allows my DSR-500 to boot again.
Okay miod@.
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index e2090f12b09..2d62bdf188c 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.64 2015/06/25 10:56:00 jmatthew Exp $ */ +/* $OpenBSD: machdep.c,v 1.65 2015/07/15 23:07:23 pirofti Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -209,14 +209,6 @@ octeon_memory_init(struct boot_info *boot_info) mem_layout[1].mem_first_page = atop(phys_avail[4]); mem_layout[1].mem_last_page = atop(phys_avail[5] - 1); realmem_bytes = 0; - } else { - /* Now map the rest of the memory */ - phys_avail[2] = 0x410000000ULL; - phys_avail[3] = (0x410000000ULL + realmem_bytes); - physmem += btoc(phys_avail[3] - phys_avail[2]); - mem_layout[1].mem_first_page = atop(phys_avail[2]); - mem_layout[1].mem_last_page = atop(phys_avail[3] - 1); - realmem_bytes = 0; } } |