From 264f4e742ac6e17a93d1975809b17bfbf79c4fc2 Mon Sep 17 00:00:00 2001
From: jh <jh@FreeBSD.org>
Date: Sat, 7 May 2011 17:59:07 +0000
Subject: To avoid duplicated warning, move WITNESS_WARN() added in r221597 to
 the branch which doesn't call malloc(9).

Suggested by:	kib
---
 sys/kern/kern_environment.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sys/kern')

diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index ce8e778..41a9fa8 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -310,7 +310,6 @@ getenv(const char *name)
 	int len;
 
 	if (dynamic_kenv) {
-		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "getenv");
 		mtx_lock(&kenv_lock);
 		cp = _getenv_dynamic(name, NULL);
 		if (cp != NULL) {
@@ -322,6 +321,8 @@ getenv(const char *name)
 		} else {
 			mtx_unlock(&kenv_lock);
 			ret = NULL;
+			WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
+			    "getenv");
 		}
 	} else
 		ret = _getenv_static(name);
-- 
cgit v1.1