aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/paging
diff options
context:
space:
mode:
authorMarvin Borner2019-10-02 20:01:17 +0200
committerMarvin Borner2019-10-02 20:01:17 +0200
commit3238ced93283a167675f20244ec9fd6310eb8002 (patch)
tree288078ca30e9e4b5d5ba9a178315cb5ee9f6a2d8 /src/kernel/paging
parent682c47a98844ffec3f3129160e9cdb98ba129989 (diff)
Finally fixed VESA auto resolution finder
This was quite hard and strange but it works now!
Diffstat (limited to 'src/kernel/paging')
-rw-r--r--src/kernel/paging/kheap.c2
-rw-r--r--src/kernel/paging/paging.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/kernel/paging/kheap.c b/src/kernel/paging/kheap.c
index 13f8ab2..2004cb8 100644
--- a/src/kernel/paging/kheap.c
+++ b/src/kernel/paging/kheap.c
@@ -21,7 +21,7 @@ void init_kheap() {
}
void *fmalloc(unsigned int size) {
- //assert(placement_address + size < MEM_END);
+ assert(placement_address + size < MEM_END);
unsigned int hold = placement_address;
memory_set((void *) hold, 0, size);
placement_address += size;
diff --git a/src/kernel/paging/paging.c b/src/kernel/paging/paging.c
index 6282953..122e4c0 100644
--- a/src/kernel/paging/paging.c
+++ b/src/kernel/paging/paging.c
@@ -8,7 +8,6 @@
vpage_dir_t *current_vpage_dir = NULL;
vpage_dir_t *root_vpage_dir = NULL;
-//Assembly abstraction for more maintainable code
page_table_t *get_cr3() {
unsigned int cr3;