projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify description of "wait" syscall. Thanks to Evan Kutter
[pintos-anon]
/
src
/
threads
/
malloc.c
diff --git
a/src/threads/malloc.c
b/src/threads/malloc.c
index 2bb5571e230d3ab483f793729a6c484960b0dc53..f6f803b9b6dc437a25876928679ab393176c086d 100644
(file)
--- a/
src/threads/malloc.c
+++ b/
src/threads/malloc.c
@@
-5,9
+5,9
@@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include "threads/mmu.h"
#include "threads/palloc.h"
#include "threads/synch.h"
#include "threads/palloc.h"
#include "threads/synch.h"
+#include "threads/vaddr.h"
/* A simple implementation of malloc().
/* A simple implementation of malloc().
@@
-214,7
+214,7
@@
realloc (void *old_block, size_t new_size)
}
/* Frees block P, which must have been previously allocated with
}
/* Frees block P, which must have been previously allocated with
- malloc()
or c
alloc(). */
+ malloc()
, calloc(), or re
alloc(). */
void
free (void *p)
{
void
free (void *p)
{