summaryrefslogtreecommitdiff
path: root/Source/Kernel/MemoryManager/PageDirectory.class.cpp
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-10-16 22:58:05 +0200
committerAlexis211 <alexis211@gmail.com>2009-10-16 22:58:05 +0200
commit54d76800cf8010434065556e12f693b101383d8b (patch)
tree5388f108f5a461fac83f593c19b85533f1a0e468 /Source/Kernel/MemoryManager/PageDirectory.class.cpp
parent518d722a88a62d81150e54b8ae02be7176171ccf (diff)
parent4d5348a49f54d95c0271c8f9c4ef01c005d6b74b (diff)
downloadMelon-54d76800cf8010434065556e12f693b101383d8b.tar.gz
Melon-54d76800cf8010434065556e12f693b101383d8b.zip
Merge branch 'heap_class'
Conflicts: Source/Kernel/Melon.ke
Diffstat (limited to 'Source/Kernel/MemoryManager/PageDirectory.class.cpp')
-rw-r--r--Source/Kernel/MemoryManager/PageDirectory.class.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Kernel/MemoryManager/PageDirectory.class.cpp b/Source/Kernel/MemoryManager/PageDirectory.class.cpp
index 2c8507f..13fbc36 100644
--- a/Source/Kernel/MemoryManager/PageDirectory.class.cpp
+++ b/Source/Kernel/MemoryManager/PageDirectory.class.cpp
@@ -43,7 +43,6 @@ PageDirectory::PageDirectory(PageDirectory* other) {
}
PageDirectory::~PageDirectory() {
- PageAlloc::free((void*)tablesPhysical);
for (int i = 0; i < 768; i++) { //Only free addresses below 0xC0000000, upper is kernel space
if (tables[i] != 0) {
for (int j = 0; j < 1024; j++) {
@@ -52,6 +51,7 @@ PageDirectory::~PageDirectory() {
PageAlloc::free((void*)tables[i]);
}
}
+ PageAlloc::free((void*)tablesPhysical);
}
page_t *PageDirectory::getPage(u32int address, bool make) {