1 files changed, 17 insertions, 2 deletions
diff --git a/src/core/malloc.c b/src/core/malloc.c
index bb34db315..db2b500c9 100644
--- a/src/core/malloc.c
+++ b/src/core/malloc.c
@@ -134,8 +134,6 @@ void * alloc_memblock ( size_t size, size_t align ) {
 			 */
 			if ( pre_size < MIN_MEMBLOCK_SIZE )
 				list_del ( &pre->list );
-			/* Zero allocated memory, for calloc() */
-			memset ( block, 0, size );
 			DBG ( "Allocated [%p,%p)\n", block,
 			      ( ( ( void * ) block ) + size ) );
 			return block;
@@ -298,6 +296,23 @@ void free ( void *ptr ) {
 }
 
 /**
+ * Allocate cleared memory
+ *
+ * @v size		Requested size
+ * @ret ptr		Allocated memory
+ *
+ * Allocate memory as per malloc(), and zero it.
+ */
+void * _calloc ( size_t size ) {
+	void *data;
+
+	data = malloc ( size );
+	if ( data )
+		memset ( data, 0, size );
+	return data;
+}
+
+/**
  * Add memory to allocation pool
  *
  * @v start		Start address