diff options
| author | Frans Kaashoek <kaashoek@26-4-190.dynamic.csail.mit.edu> | 2010-08-30 17:28:39 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@26-4-190.dynamic.csail.mit.edu> | 2010-08-30 17:28:39 -0400 |
| commit | 791d81cadeb3b30ad6ec67c61086c6747f3d5ca2 (patch) | |
| tree | 989981e6fce1479281968cf07dc932ec061097a9 /user.h | |
| parent | 156b307e28c52597fddea68baa5ca1f052520657 (diff) | |
| parent | 3c9ff073e09abf15f241aa1812e04d8587c9925d (diff) | |
| download | xv6-labs-2022-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.tar.xz xv6-labs-2022-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.zip | |
Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page
Diffstat (limited to 'user.h')
| -rw-r--r-- | user.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -21,6 +21,7 @@ int dup(int); int getpid(); char* sbrk(int); int sleep(int); +int uptime(); // ulib.c int stat(char*, struct stat*); |