merged in all changes done to the trunk up to Aug 28

[pintos-anon] / src / threads / palloc.c

diff --git a/src/threads/palloc.c b/src/threads/palloc.c
index ddbfeda1cdecaa511b775aa3f7ccd9f5ea043c99..46bfefcafa029e5478a5049bbba7bd869d93a434 100644 (file)
--- a/src/threads/palloc.c
+++ b/src/threads/palloc.c
@@ -42,7 +42,6 @@ size_t user_page_limit = SIZE_MAX;
 static void init_pool (struct pool *, void *base, size_t page_cnt,
                        const char *name);
 static bool page_from_pool (const struct pool *, void *page);
-static void page_set_cache(void* page, bool enable_cache);
 
 /* Initializes the page allocator. */
 void