From c7d2507fc455421429a531d722947ab415259c77 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Sun, 3 Dec 2017 15:11:23 +0100
Subject: Revert "Make assert have no side effects"

This reverts commit d18d0e85596f90e0bd597b33d58209d0b3973c95.
---
 vm/vm_kmem.c | 4 ++--
 vm/vm_page.c | 2 +-
 vm/vm_page.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'vm')

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);
-- 
cgit v1.2.3