summaryrefslogtreecommitdiffstats
path: root/rtemsbsd/rtems/rtems-kernel-page.c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-10-07 15:10:20 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-01-10 09:53:31 +0100
commitc40e45b75eb76d79a05c7fa85c1fa9b5c728a12f (patch)
treead4f2519067709f00ab98b3c591186c26dc3a21f /rtemsbsd/rtems/rtems-kernel-page.c
parentuserspace-header-gen.py: Simplify program ports (diff)
downloadrtems-libbsd-c40e45b75eb76d79a05c7fa85c1fa9b5c728a12f.tar.bz2
Update to FreeBSD head 2016-08-23
Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.
Diffstat (limited to 'rtemsbsd/rtems/rtems-kernel-page.c')
-rw-r--r--rtemsbsd/rtems/rtems-kernel-page.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rtemsbsd/rtems/rtems-kernel-page.c b/rtemsbsd/rtems/rtems-kernel-page.c
index cfcbb1a0..8f8c235a 100644
--- a/rtemsbsd/rtems/rtems-kernel-page.c
+++ b/rtemsbsd/rtems/rtems-kernel-page.c
@@ -94,10 +94,12 @@ rtems_bsd_page_alloc(uintptr_t size_in_bytes, int wait)
mtx_unlock(&page_heap_mtx);
#ifdef INVARIANTS
- if (addr != NULL) {
+ wait |= M_ZERO;
+#endif
+
+ if (addr != NULL && (wait & M_ZERO) != 0) {
memset(addr, 0, size_in_bytes);
}
-#endif
return (addr);
}