Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv

2 files changed, 2 insertions, 1 deletions

diff --git a/kernel/kalloc.c b/kernel/kalloc.c
index fa6a0ac..0699e7e 100644
--- a/kernel/kalloc.c
+++ b/kernel/kalloc.c
@@ -39,7 +39,7 @@ freerange(void *pa_start, void *pa_end)
     kfree(p);
 }
 
-// Free the page of physical memory pointed at by v,
+// Free the page of physical memory pointed at by pa,
 // which normally should have been returned by a
 // call to kalloc().  (The exception is when
 // initializing the allocator; see kinit above.)
diff --git a/kernel/printf.c b/kernel/printf.c
index e1347de..1a50203 100644
--- a/kernel/printf.c
+++ b/kernel/printf.c
@@ -109,6 +109,7 @@ printf(char *fmt, ...)
       break;
     }
   }
+  va_end(ap);
 
   if(locking)
     release(&pr.lock);