From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 8 Jan 2006 20:23:27 +0000 (+0000)
Subject: Sync with sources.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=081c3133d9fc92b8f5203259bd09492916c23c60;p=pintos-anon

Sync with sources.
---

diff --git a/solutions/p4.patch b/solutions/p4.patch
index febbcaa..82a51e1 100644
--- a/solutions/p4.patch
+++ b/solutions/p4.patch
@@ -2566,7 +2566,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c
  
    ASSERT (file != NULL);
    ASSERT (phdr != NULL);
-@@ -332,69 +458,129 @@ load_segment (struct file *file, const s
+@@ -332,73 +458,129 @@ load_segment (struct file *file, const s
        || start == 0)
      return false; 
  
@@ -2709,8 +2709,12 @@ diff -u src/userprog/process.c~ src/userprog/process.c
  }
  
 -/* Adds a mapping from user virtual address UPAGE to kernel
--   virtual address KPAGE to the page table.  Fails if UPAGE is
--   already mapped or if memory allocation fails. */
+-   virtual address KPAGE to the page table.
+-   UPAGE must not already be mapped.
+-   KPAGE should probably be a page obtained from the user pool
+-   with palloc_get_page().
+-   Returns true on success, false if UPAGE is already mapped or
+-   if memory allocation fails. */
 +/* Create a minimal stack for T by mapping a page at the
 +   top of user virtual memory.  Fills in the page using CMD_LINE
 +   and sets *ESP to the stack pointer. */