Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page

1 files changed, 1 insertions, 0 deletions

diff --git a/user.h b/user.h
index 8280b2e..431428c 100644
--- a/user.h
+++ b/user.h
@@ -21,6 +21,7 @@ int dup(int);
 int getpid();
 char* sbrk(int);
 int sleep(int);
+int uptime();
 
 // ulib.c
 int stat(char*, struct stat*);