Merge branch 'vm/lazy-loading' into vm/page-swap-synch

2024-12-04 19:11:37 +00:00
parent 4bf6914cfa
commit 1e236a5c47
7 changed files with 59 additions and 43 deletions
--- a/src/vm/frame.c
+++ b/src/vm/frame.c
@@ -260,4 +260,3 @@ lru_prev (struct list_elem *e)

  return list_prev (e);
 }
-
--- a/src/vm/page.c
+++ b/src/vm/page.c
@@ -154,4 +154,3 @@ page_get_swap (struct thread *owner, void *upage)
   /* Masks the address bits and returns truncated value. */
   return ((*pte & PTE_ADDR) >> ADDR_START_BIT);
 }
-