2 files changed, 2 insertions, 8 deletions

diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index e990c64c3f74..4f6b9ef5f13e 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -154,7 +154,7 @@ and lowercase means that the behavior is not set, or off.
 .Bl -tag -width indent
 .It A
 All warnings (except for the warning about unknown
-flags being set), and failure to allocate memory become fatal.
+flags being set) become fatal.
 The process will call
 .Xr abort 3
 in these cases.
@@ -372,10 +372,6 @@ The allocation functions were compiled with
 .Dq EXTRA_SANITY
 defined, and an error was found during the additional error checking.
 Consult the source code for further information.
-.It "allocation failed
-If the
-.Dq A
-option is specified it is a fatal error for an allocation function to fail.
 .It "mmap(2) failed, check limits
 This most likely means that the system is dangerously overloaded or that
 the process' limits are incorrectly specified.
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index ac0dd485093c..412171840dfd 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -715,9 +715,6 @@ imalloc(size_t size)
     else
 	result =  malloc_pages(size);
 
-    if (malloc_abort && !result)
-	wrterror("allocation failed.\n");
-
     if (malloc_zero && result)
 	memset(result, 0, size);
 
@@ -1067,6 +1064,7 @@ malloc(size_t size)
     if (malloc_active++) {
 	wrtwarning("recursive call.\n");
         malloc_active--;
+        THREAD_UNLOCK();
 	return (0);
     }
     if (!malloc_started)