Merge branch 'cow' into net

Conflicts:
	.gitignore
	Makefile
	conf/lab.mk
	kernel/defs.h
	kernel/syscall.c
	kernel/vm.c
	user/pingpong.c
	user/user.h
	user/usys.pl

1 files changed, 4 insertions, 0 deletions

diff --git a/user/usys.pl b/user/usys.pl
index 6453fe9..33af0ad 100755
--- a/user/usys.pl
+++ b/user/usys.pl
@@ -36,5 +36,9 @@ entry("getpid");
 entry("sbrk");
 entry("sleep");
 entry("uptime");
+entry("trace");
+entry("sysinfo");
 entry("connect");
 entry("pgaccess");
+entry("sigalarm");
+entry("sigreturn");