Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/vm/page-swap-synch' into vm/virtual-memory/saleh

Browse Source 
# Conflicts:
#	.gitlab-ci.yml
#	src/Makefile.build
#	src/threads/thread.c
#	src/userprog/exception.c
#	src/userprog/process.c
#	src/vm/frame.c
#	src/vm/page.c
#	src/vm/page.h
#	src/vm/stackgrowth.c
#	src/vm/stackgrowth.h
This commit is contained in:
sBubshait
2024-12-05 02:21:53 +00:00
parent 1a8eb1bbe5 ac31fb1e1e
commit f13fd435cd
11 changed files with 222 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.build
View File

@@ -66,6 +66,7 @@ vm_SRC += vm/frame.c # Frame table manager.
vm_SRC += vm/page.c # Page table manager.
vm_SRC += vm/mmap.c # Memory-mapped files.
vm_SRC += devices/swap.c # Swap block manager.
#vm_SRC = vm/file.c # Some other file.
# Filesystem code.
filesys_SRC = filesys/filesys.c # Filesystem core.