diff options
author | Frans Kaashoek <[email protected]> | 2010-08-31 13:58:50 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2010-08-31 13:58:50 -0400 |
commit | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (patch) | |
tree | 4c9d10f56fe4f69b97820ef94db93f30acda6e65 /defs.h | |
parent | 791d81cadeb3b30ad6ec67c61086c6747f3d5ca2 (diff) | |
parent | 7d7dc9331bf33f77c9c3a71350782dadae8dd371 (diff) | |
download | xv6-labs-9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20.tar.gz xv6-labs-9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20.tar.bz2 xv6-labs-9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20.zip |
Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page
Diffstat (limited to 'defs.h')
-rw-r--r-- | defs.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -60,9 +60,8 @@ extern uchar ioapicid; void ioapicinit(void); // kalloc.c -extern int nfreemem; -char* kalloc(int); -void kfree(char*, int); +char* kalloc(void); +void kfree(char*); void kinit(char*,uint); // kbd.c |