Merge branch 'scale-amd64' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into scale-amd64

7d71762b · Silas Boyd-Wickizer · 25ec39fd · a2fb0954 · 7d71762b · 7d71762b
--- a/include/kernel.hh
+++ b/include/kernel.hh
@@ -73,6 +73,7 @@ void            panic(const char*, ...)
                  __noret__ __attribute__((format(printf, 1, 2)));
 void            kerneltrap(struct trapframe *tf) __noret__;
 void            snprintf(char *buf, u32 n, const char *fmt, ...);
+void            printtrace(u64 rbp);

 #define assert(c)   if (!(c)) { cprintf("%s:%d: ", __FILE__, __LINE__); panic("assertion failure"); }


--- a/kernel/console.cc
+++ b/kernel/console.cc
@@ -148,7 +148,7 @@ puts(const char *s)

 }

-static inline void
+void
 printtrace(u64 rbp)
 {
  uptr pc[10];

--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -479,8 +479,10 @@ vmap::pagefault(uptr va, u32 err)
    return -1;

  atomic<pme_t> *pte = walkpgdir(pml4, va, 1);
-  if (pte == nullptr)
-    panic("pagefault: couldn't allocate page table");
+  if (pte == nullptr) {
+    cprintf("pagefault: couldn't allocate page table\n");
+    return -1;
+  }

 retry:
  pme_t ptev = pte->load();