usb.patch, with conflicts and some warnings fixed

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

diff --git a/src/threads/palloc.c b/src/threads/palloc.c
index 4fc8394c8f078a20c5a48722c36e3e022658620e..fbd74fc57917a356f9532078754e1d3a4e37f9e1 100644 (file)
--- a/src/threads/palloc.c
+++ b/src/threads/palloc.c
@@ -39,6 +39,7 @@ static struct pool kernel_pool, user_pool;
 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.  At most USER_PAGE_LIMIT
    pages are put into the user pool. */