1 files changed, 15 insertions, 0 deletions
diff --git a/user/user.h b/user/user.h
index 2d6ace6..ed7737a 100644
--- a/user/user.h
+++ b/user/user.h
@@ -3,6 +3,7 @@ typedef unsigned long size_t;
 typedef long int off_t;
 #endif
 struct stat;
+struct sysinfo;
 
 // system calls
 int fork(void);
@@ -34,6 +35,14 @@ int pgaccess(void *base, int len, void *mask);
 // usyscall region
 int ugetpid(void);
 #endif
+<<<<<<< HEAD
+=======
+int trace(int);
+int sysinfo(struct sysinfo*);
+int sigalarm(int ticks, void (*handler)());
+int sigreturn(void);
+int symlink(char *, char *);
+>>>>>>> fs
 
 // ulib.c
 int stat(const char*, struct stat*);
@@ -51,6 +60,12 @@ void free(void*);
 int atoi(const char*);
 int memcmp(const void *, const void *, uint);
 void *memcpy(void *, const void *, uint);
+<<<<<<< HEAD
 #ifdef LAB_LOCK
 int statistics(void*, int);
 #endif
+=======
+
+// statistics.c
+int statistics(void*, int);
+>>>>>>> fs