Merge branch 'virtual-memory' into 'ethan-stack-growth'

# Conflicts:
#   src/Makefile.build
This commit is contained in:
Demetriades, Themis
2024-11-30 23:21:16 +00:00
7 changed files with 353 additions and 10 deletions

View File

@@ -32,6 +32,7 @@
#include "tests/threads/tests.h"
#endif
#ifdef VM
#include "vm/frame.h"
#include "devices/swap.h"
#endif
#ifdef FILESYS
@@ -101,6 +102,9 @@ main (void)
palloc_init (user_page_limit);
malloc_init ();
paging_init ();
#ifdef VM
frame_init ();
#endif
/* Segmentation. */
#ifdef USERPROG