From af2f9184e03015dc3b188ea437bbf496638000ce Mon Sep 17 00:00:00 2001 From: dzwdz Date: Sat, 11 Sep 2021 18:04:57 +0200 Subject: replace `user_ptr` with a linux-style `__user` annotation --- src/kernel/proc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/kernel/proc.c') diff --git a/src/kernel/proc.c b/src/kernel/proc.c index 8d363a8..21a1d54 100644 --- a/src/kernel/proc.c +++ b/src/kernel/proc.c @@ -26,14 +26,14 @@ struct process *process_seed(void) { proc->handles[i].type = HANDLE_EMPTY; // map the stack to the last page in memory - pagedir_map(proc->pages, ~PAGE_MASK, page_alloc(1), true, true); - proc->stack_top = proc->regs.esp = ~0xF; + pagedir_map(proc->pages, (userptr_t)~PAGE_MASK, page_alloc(1), true, true); + proc->stack_top = proc->regs.esp = (userptr_t) ~0xF; // map the kernel // yup, .text is writeable too. the plan is to not map the kernel // into user memory at all, but i'll implement that later. TODO for (size_t p = 0x100000; p < (size_t)&_bss_end; p += PAGE_SIZE) - pagedir_map(proc->pages, p, (void*)p, false, true); + pagedir_map(proc->pages, (userptr_t)p, (void*)p, false, true); // the kernel still has to load the executable code and set EIP return proc; -- cgit v1.2.3