summaryrefslogtreecommitdiff
path: root/defs.h
diff options
context:
space:
mode:
Diffstat (limited to 'defs.h')
-rw-r--r--defs.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/defs.h b/defs.h
index 921c7bf..efbbe3d 100644
--- a/defs.h
+++ b/defs.h
@@ -62,11 +62,10 @@ extern uchar ioapicid;
void ioapicinit(void);
// kalloc.c
-char* enter_alloc(void);
char* kalloc(void);
void kfree(char*);
-void kinit(void);
-uint detect_memory(void);
+void kinit1(void*, void*);
+void kinit2(void*, void*);
// kbd.c
void kbdintr(void);
@@ -165,7 +164,7 @@ void uartputc(int);
void seginit(void);
void kvmalloc(void);
void vmenable(void);
-pde_t* setupkvm(char* (*alloc)());
+pde_t* setupkvm();
char* uva2ka(pde_t*, char*);
int allocuvm(pde_t*, uint, uint);
int deallocuvm(pde_t*, uint, uint);