compiles

arch/x86_64/sched.c

@@ -4,7 +4,7 @@
 #include <zinnia/percpu.h>
 #include <zinnia/pmap.h>
 #include <zinnia/sched.h>
-#include <zinnia/vas.h>
+#include <zinnia/vma.h>
 #include <bits/sched.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -119,7 +119,7 @@ errno_t arch_task_init(
     if (is_user) {
         // Allocate FPU space.
         const size_t fpu_size = cpu->fpu_size;
-        void* fpu_base = vm_alloc(fpu_size);
+        uintptr_t fpu_base = vm_alloc(fpu_size);
         if (!fpu_base)
             return ENOMEM;
         for (size_t i = 0; i < fpu_size; i += arch_mem_page_size()) {
@@ -130,9 +130,9 @@ errno_t arch_task_init(
                 return s;
             }
 
-            pmap_map(&kernel_vas.pmap, (uintptr_t)fpu_base, page, PTE_WRITE | PTE_READ, CACHE_WRITE_BACK);
+            pmap_map(&kernel_vma.pmap, (uintptr_t)fpu_base, page, PTE_WRITE | PTE_READ, CACHE_WRITE_BACK);
         }
-        context->fpu_region = fpu_base;
+        context->fpu_region = (void*)fpu_base;
 
         context->ds = asm_read_ds();
         context->es = asm_read_es();