diff options
author | Richard Braun <rbraun@sceen.net> | 2017-09-01 23:58:41 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2017-09-02 15:25:37 +0200 |
commit | 9c7906d8ad6ebec014b22b8757d916e9cad7d6d3 (patch) | |
tree | 6c3472f59cf64244ab86d2fc13b220b1c8f61165 /vm | |
parent | c2f36bcecfd93576a988c8e3222d1a63c2357260 (diff) |
Make assert have no side effects
This makes sure symbols referenced by assert uses may not be generated
if unused. The recently introduced __unused macro is used to suppress
compiler warnings resulting from this change.
Diffstat (limited to 'vm')
-rw-r--r-- | vm/vm_kmem.c | 4 | ||||
-rw-r--r-- | vm/vm_page.c | 2 | ||||
-rw-r--r-- | vm/vm_page.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vm/vm_kmem.c b/vm/vm_kmem.c index 101c981..d526804 100644 --- a/vm/vm_kmem.c +++ b/vm/vm_kmem.c @@ -64,7 +64,7 @@ INIT_OP_DEFINE(vm_kmem_setup, INIT_OP_DEP(vm_object_setup, true), INIT_OP_DEP(vm_page_setup, true)); -static int +__unused static int vm_kmem_alloc_check(size_t size) { if (!vm_page_aligned(size) @@ -75,7 +75,7 @@ vm_kmem_alloc_check(size_t size) return 0; } -static int +__unused 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 49c2c11..19f6f4b 100644 --- a/vm/vm_page.c +++ b/vm/vm_page.c @@ -790,7 +790,7 @@ vm_page_lookup(phys_addr_t pa) return NULL; } -static bool +__unused 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 70a0091..e9ca321 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) { - unsigned int nr_refs; + __unused unsigned int nr_refs; nr_refs = atomic_fetch_add(&page->nr_refs, 1, ATOMIC_RELAXED); assert(nr_refs != (unsigned int)-1); |