diff options
| author | Frans Kaashoek <[email protected]> | 2010-08-26 08:03:18 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2010-08-26 08:03:18 -0400 |
| commit | d55b2fac074ac23e30c337014f40ae2156b31b60 (patch) | |
| tree | bb9885972bf8929e7957f9ea512a8befaf06b11c /usys.S | |
| parent | d87f51c5a1c5e7a2a3ba111b1052a297f4f96fb0 (diff) | |
| parent | 789b508d538e6faf635e49f268a4f1f9e9b65f05 (diff) | |
| download | xv6-labs-d55b2fac074ac23e30c337014f40ae2156b31b60.tar.gz xv6-labs-d55b2fac074ac23e30c337014f40ae2156b31b60.tar.bz2 xv6-labs-d55b2fac074ac23e30c337014f40ae2156b31b60.zip | |
Merge commit 'origin/page' into page
Diffstat (limited to 'usys.S')
| -rw-r--r-- | usys.S | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -28,3 +28,4 @@ SYSCALL(dup) SYSCALL(getpid) SYSCALL(sbrk) SYSCALL(sleep) +SYSCALL(uptime) |