diff options
| author | Mole Shang <[email protected]> | 2024-02-19 14:10:32 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-19 14:36:21 +0800 |
| commit | d86118fc80267649b4791c8c0c72ebd60edf1ef2 (patch) | |
| tree | b792b617b4df80a5803a9c1164d0e3fdfe9cfe31 /user/user.h | |
| parent | b20ef9d0210fd7d9403acde1857eed1b9880c0b2 (diff) | |
| parent | 0cf897cbe05fd8485162619db4244f4159d0eb52 (diff) | |
| download | xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.tar.gz xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.tar.bz2 xv6-labs-d86118fc80267649b4791c8c0c72ebd60edf1ef2.zip | |
Merge branch 'fs' into mmap
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
user/user.h
Diffstat (limited to 'user/user.h')
| -rw-r--r-- | user/user.h | 15 |
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 |