summaryrefslogtreecommitdiff
path: root/vm
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-12-03 15:11:23 +0100
committerRichard Braun <rbraun@sceen.net>2017-12-03 15:11:23 +0100
commitc7d2507fc455421429a531d722947ab415259c77 (patch)
tree52609a956ec9e3bd1f1274aa9d799597866bfcd1 /vm
parent303ed5305f8dae17ab46aa1e0dc6086d4277808c (diff)
Revert "Make assert have no side effects"
This reverts commit d18d0e85596f90e0bd597b33d58209d0b3973c95.
Diffstat (limited to 'vm')
-rw-r--r--vm/vm_kmem.c4
-rw-r--r--vm/vm_page.c2
-rw-r--r--vm/vm_page.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/vm/vm_kmem.c b/vm/vm_kmem.c
index c0a91f15..07fd4d88 100644
--- a/vm/vm_kmem.c
+++ b/vm/vm_kmem.c
@@ -56,7 +56,7 @@ INIT_OP_DEFINE(vm_kmem_setup,
INIT_OP_DEP(vm_object_setup, true),
INIT_OP_DEP(vm_page_setup, true));
-__unused static int
+static int
vm_kmem_alloc_check(size_t size)
{
if (!vm_page_aligned(size)
@@ -67,7 +67,7 @@ vm_kmem_alloc_check(size_t size)
return 0;
}
-__unused static int
+static int
vm_kmem_free_check(uintptr_t va, size_t size)
{
if (!vm_page_aligned(va)) {
diff --git a/vm/vm_page.c b/vm/vm_page.c
index a3844662..38cc8af0 100644
--- a/vm/vm_page.c
+++ b/vm/vm_page.c
@@ -792,7 +792,7 @@ vm_page_lookup(phys_addr_t pa)
return NULL;
}
-__unused static bool
+static bool
vm_page_block_referenced(const struct vm_page *page, unsigned int order)
{
unsigned int i, nr_pages;
diff --git a/vm/vm_page.h b/vm/vm_page.h
index 844ad066..9c8fa91c 100644
--- a/vm/vm_page.h
+++ b/vm/vm_page.h
@@ -240,7 +240,7 @@ vm_page_referenced(const struct vm_page *page)
static inline void
vm_page_ref(struct vm_page *page)
{
- __unused unsigned int nr_refs;
+ unsigned int nr_refs;
nr_refs = atomic_fetch_add(&page->nr_refs, 1, ATOMIC_RELAXED);
assert(nr_refs != (unsigned int)-1);