Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Reverted r34863.

Browse Source 
* Don't keep any memory mappings from the OF for the time being. We can't
  keep mappings < 2 GB, since those aren't in the kernel address space and
  we don't handle memory mapped registers or the like correctly either.
Ticket #5193.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36886 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-05-21 15:33:28 +00:00
parent d2717a34c6
commit 3a5655a502
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp
View File

@ -199,6 +199,7 @@ insert_virtual_allocated_range(void *start, uint32 size)
} }
#if 0
static status_t static status_t
insert_virtual_range_to_keep(void *start, uint32 size) insert_virtual_range_to_keep(void *start, uint32 size)
{ {
@ -206,6 +207,7 @@ insert_virtual_range_to_keep(void *start, uint32 size)
gKernelArgs.arch_args.num_virtual_ranges_to_keep, gKernelArgs.arch_args.num_virtual_ranges_to_keep,
MAX_VIRTUAL_RANGES_TO_KEEP, start, size); MAX_VIRTUAL_RANGES_TO_KEEP, start, size);
} }
#endif
static status_t static status_t
@ -474,10 +476,6 @@ find_allocated_ranges(void *oldPageTable, void *pageTable,
} }
if (map->virtual_address == oldPageTable) if (map->virtual_address == oldPageTable)
keepRange = false; keepRange = false;
if (!is_physical_memory(map->physical_address)) {
keepRange = false;
// we only get vm_pages for physical memory
}
// insert range in virtual allocated // insert range in virtual allocated
@ -494,6 +492,12 @@ find_allocated_ranges(void *oldPageTable, void *pageTable,
// insert range in virtual ranges to keep // insert range in virtual ranges to keep
// TODO: ATM keeping the ranges doesn't make much sense. The OF usually identity
// maps stuff, which means that RAM will most likely be mapped < 2 GB, which we
// cannot preserve, since that doesn't lie in the kernel address space. Mappings
// >= 2 GB are probably memory mapped hardware registers or the frame buffer
// (i.e. non-RAM), which we don't handle correctly ATM.
#if 0
if (keepRange) { if (keepRange) {
if (insert_virtual_range_to_keep(map->virtual_address, if (insert_virtual_range_to_keep(map->virtual_address,
map->length) != B_OK) { map->length) != B_OK) {
@ -501,6 +505,7 @@ find_allocated_ranges(void *oldPageTable, void *pageTable,
gKernelArgs.num_virtual_allocated_ranges); gKernelArgs.num_virtual_allocated_ranges);
} }
} }
#endif
total += map->length; total += map->length;
} }