update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / libc / stdlib / malloc-simple / alloc.c

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/libc/stdlib/malloc-simple/alloc.c b/l4/pkg/uclibc/lib/contrib/uclibc/libc/stdlib/malloc-simple/alloc.c
index 51da14ac82d3a7c90a8529fa5d1b3fcda34b062c..914c89dc050fce8c4bebb9d38821d5fa5e79d17f 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/libc/stdlib/malloc-simple/alloc.c
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/libc/stdlib/malloc-simple/alloc.c
@@ -60,11 +60,10 @@ void * calloc(size_t nmemb, size_t lsize)
                __set_errno(ENOMEM);
                return NULL;
        }
-       result=malloc(size);
-#if 0
-       /* Standard unix mmap using /dev/zero clears memory so calloc
-        * doesn't need to actually zero anything....
-        */
+       result = malloc(size);
+
+#ifndef __ARCH_USE_MMU__
+       /* mmap'd with MAP_UNINITIALIZE, we have to blank memory ourselves */
        if (result != NULL) {
                memset(result, 0, size);
        }