aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/paging/kheap.c
diff options
context:
space:
mode:
authorMarvin Borner2019-10-23 19:51:55 +0200
committerMarvin Borner2019-10-23 19:51:55 +0200
commit44c31c3f130aa5b337eeae73f4875f05cf0440de (patch)
treebe7b6b60aa8b3eda4beabce3624d907ad853100e /src/kernel/paging/kheap.c
parent4f46185c708112132987e9da4dc2197d833a032a (diff)
Added es:di manual setting
Diffstat (limited to 'src/kernel/paging/kheap.c')
-rw-r--r--src/kernel/paging/kheap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/kernel/paging/kheap.c b/src/kernel/paging/kheap.c
index 9af33f7..17fc0e7 100644
--- a/src/kernel/paging/kheap.c
+++ b/src/kernel/paging/kheap.c
@@ -19,13 +19,11 @@ uint32_t kmalloc_int(uint32_t sz, int align, uint32_t *phys) {
return (uint32_t) addr;
} else {
if (align == 1 && (placement_address & 0xFFFFF000)) {
-
placement_address &= 0xFFFFF000;
placement_address += 0x1000;
}
- if (phys) {
+ if (phys)
*phys = placement_address;
- }
uint32_t tmp = placement_address;
placement_address += sz;
return tmp;