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

Merge branch 'virtual-memory' into 'page-swap-helpers'

Browse Source 
# Conflicts:
#   src/vm/frame.c
#   src/vm/page.c
This commit is contained in:
Demetriades, Themis
2024-12-01 21:44:17 +00:00
parent 94adc11f03 7ce512305e
commit 9d35beb2e4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/userprog/Make.vars
View File

@@ -1,6 +1,6 @@
# -*- makefile -*-
kernel.bin: DEFINES = -DUSERPROG -DFILESYS -DVM
kernel.bin: DEFINES = -DUSERPROG -DFILESYS
KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys vm
TEST_SUBDIRS = tests/userprog tests/userprog/no-vm tests/filesys/base
GRADING_FILE = $(SRCDIR)/tests/userprog/Grading