diff options
| author | Mole Shang <[email protected]> | 2024-02-19 21:51:26 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-19 22:13:01 +0800 |
| commit | 09ba9112386d5d59d7f2a31c469768c582acb939 (patch) | |
| tree | b1dce737cdd94164e8d7f3f651ea7a86a22a42f3 /user/user.h | |
| parent | d86118fc80267649b4791c8c0c72ebd60edf1ef2 (diff) | |
| download | xv6-labs-09ba9112386d5d59d7f2a31c469768c582acb939.tar.gz xv6-labs-09ba9112386d5d59d7f2a31c469768c582acb939.tar.bz2 xv6-labs-09ba9112386d5d59d7f2a31c469768c582acb939.zip | |
lab mmap: finish
Diffstat (limited to 'user/user.h')
| -rw-r--r-- | user/user.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/user/user.h b/user/user.h index ed7737a..5d6222e 100644 --- a/user/user.h +++ b/user/user.h @@ -35,14 +35,13 @@ 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 +void *mmap(void *, uint64, int, int, int, uint64); +int munmap(void *, uint64); // ulib.c int stat(const char*, struct stat*); @@ -60,12 +59,6 @@ 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 |