diff options
| author | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2015-06-25 10:56:01 +0000 |
|---|---|---|
| committer | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2015-06-25 10:56:01 +0000 |
| commit | 05a7beb9b94f50766412f122b71a84827f68d56b (patch) | |
| tree | 00df0fc36eb61664414533fd9c1b317a55f54859 /sys | |
| parent | 94ce3f0b646fa07aca342ef03287cc46b2f7351f (diff) | |
Re-enable memory above 256mb now that uvm_pmr_get1page() has been fixed.
From Visa Hankala.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 0ad59525258..e2090f12b09 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.63 2014/12/10 15:29:53 mikeb Exp $ */ +/* $OpenBSD: machdep.c,v 1.64 2015/06/25 10:56:00 jmatthew Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -193,7 +193,6 @@ octeon_memory_init(struct boot_info *boot_info) if (boot_info->board_type != BOARD_TYPE_SIM) { if (realmem_bytes > OCTEON_DRAM_FIRST_256_END) { -#if 0 /* XXX: need fix on mips64 pmap code */ /* take out the upper non-cached 1/2 */ phys_avail[2] = 0x410000000ULL; phys_avail[3] = @@ -201,7 +200,6 @@ octeon_memory_init(struct boot_info *boot_info) physmem += btoc(phys_avail[3] - phys_avail[2]); mem_layout[2].mem_first_page = atop(phys_avail[2]); mem_layout[2].mem_last_page = atop(phys_avail[3] - 1); -#endif realmem_bytes -= OCTEON_DRAM_FIRST_256_END; /* Now map the rest of the memory */ @@ -212,7 +210,6 @@ octeon_memory_init(struct boot_info *boot_info) mem_layout[1].mem_last_page = atop(phys_avail[5] - 1); realmem_bytes = 0; } else { -#if 0 /* XXX: need fix on mips64 pmap code */ /* Now map the rest of the memory */ phys_avail[2] = 0x410000000ULL; phys_avail[3] = (0x410000000ULL + realmem_bytes); @@ -220,7 +217,6 @@ octeon_memory_init(struct boot_info *boot_info) mem_layout[1].mem_first_page = atop(phys_avail[2]); mem_layout[1].mem_last_page = atop(phys_avail[3] - 1); realmem_bytes = 0; -#endif } } |