From d9ca757cea4bc90ef070d1157da27c7fcbd88510 Mon Sep 17 00:00:00 2001
From: Davide Italiano <davide@FreeBSD.org>
Date: Fri, 17 Oct 2014 17:34:05 +0000
Subject: [PATCH] Convert remaining {g,s}etenv->kern_{g,s}etenv left over from
 r273174.

Reported by:    bz
---
 sys/dev/cfe/cfe_env.c            | 2 +-
 sys/dev/nvram2env/nvram2env.c    | 6 +++---
 sys/mips/beri/beri_machdep.c     | 4 ++--
 sys/mips/rmi/xlr_machdep.c       | 4 ++--
 sys/mips/rt305x/rt305x_machdep.c | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys/dev/cfe/cfe_env.c b/sys/dev/cfe/cfe_env.c
index c47086be614..9b2a3a306e1 100644
--- a/sys/dev/cfe/cfe_env.c
+++ b/sys/dev/cfe/cfe_env.c
@@ -52,7 +52,7 @@ cfe_env_init(void)
 		if (cfe_enumenv(idx, name, sizeof(name), val, sizeof(val)) != 0)
 			break;
 
-		if (setenv(name, val) != 0) {
+		if (kern_setenv(name, val) != 0) {
 			printf("No space to store CFE env: \"%s=%s\"\n",
 				name, val);
 		}
diff --git a/sys/dev/nvram2env/nvram2env.c b/sys/dev/nvram2env/nvram2env.c
index 5de4f879bbc..608fac60767 100644
--- a/sys/dev/nvram2env/nvram2env.c
+++ b/sys/dev/nvram2env/nvram2env.c
@@ -263,7 +263,7 @@ nvram2env_attach(device_t dev)
 				if (bootverbose)
 					printf("ENV: %s=%s\n", pair, value);
 #endif
-				setenv(pair, value);
+				kern_setenv(pair, value);
 
 				if (strcasecmp(pair, "WAN_MAC_ADDR") == 0) {
 					/* Alias for MAC address of eth0 */
@@ -271,7 +271,7 @@ nvram2env_attach(device_t dev)
 						printf("ENV: aliasing "
 						    "WAN_MAC_ADDR to ethaddr"
 						    " = %s\n",  value);
-					setenv("ethaddr", value);
+					kern_setenv("ethaddr", value);
 				}
 				else if (strcasecmp(pair, "LAN_MAC_ADDR") == 0){
 					/* Alias for MAC address of eth1 */
@@ -279,7 +279,7 @@ nvram2env_attach(device_t dev)
 						printf("ENV: aliasing "
 						    "LAN_MAC_ADDR to eth1addr"
 						    " = %s\n",  value);
-					setenv("eth1addr", value);
+					kern_setenv("eth1addr", value);
 				}
 
 				if (strcmp(pair, "bootverbose") == 0)
diff --git a/sys/mips/beri/beri_machdep.c b/sys/mips/beri/beri_machdep.c
index f532f609d19..deda11968f7 100644
--- a/sys/mips/beri/beri_machdep.c
+++ b/sys/mips/beri/beri_machdep.c
@@ -164,9 +164,9 @@ _parse_bootargs(char *cmdline)
 		} else {
 			n = strsep(&v, "=");
 			if (v == NULL)
-				setenv(n, "1");
+				kern_setenv(n, "1");
 			else
-				setenv(n, v);
+				kern_setenv(n, v);
 		}
 	}
 }
diff --git a/sys/mips/rmi/xlr_machdep.c b/sys/mips/rmi/xlr_machdep.c
index 8eaf97ef5f1..ad3d07355fd 100644
--- a/sys/mips/rmi/xlr_machdep.c
+++ b/sys/mips/rmi/xlr_machdep.c
@@ -458,9 +458,9 @@ platform_start(__register_t a0 __unused,
 		printf("\t%s\n", arg);
 		n = strsep(&arg, "=");
 		if (arg == NULL)
-			setenv(n, "1");
+			kern_setenv(n, "1");
 		else
-			setenv(n, arg);
+			kern_setenv(n, arg);
 	}
 
 	xlr_set_boot_flags();
diff --git a/sys/mips/rt305x/rt305x_machdep.c b/sys/mips/rt305x/rt305x_machdep.c
index 07342bde9ed..dab2ce6c379 100644
--- a/sys/mips/rt305x/rt305x_machdep.c
+++ b/sys/mips/rt305x/rt305x_machdep.c
@@ -167,7 +167,7 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 			arg = (char *)(intptr_t)MIPS_PHYS_TO_KSEG0(argv[i]);
 			printf("\targv[%d] = %s\n", i, arg);
 			sprintf(n, "argv%d", i);
-			setenv(n, arg);
+			kern_setenv(n, arg);
 		}
 	}
 
@@ -180,9 +180,9 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 		printf("\t%s\n", arg);
 		n = strsep(&arg, "=");
 		if (arg == NULL)
-			setenv(n, "1");
+			kern_setenv(n, "1");
 		else
-			setenv(n, arg);
+			kern_setenv(n, arg);
 	}