diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c
index 2940d8a92c6..0d8aa12a7f9 100644
--- a/sys/boot/efi/loader/main.c
+++ b/sys/boot/efi/loader/main.c
@@ -106,13 +106,13 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
 	bootfile = GetEnvironmentVariable(ARCENV_BOOTFILE);
 	if (bootfile)
 		setenv("bootfile", bootfile, 1);
-
-	env_setenv("currdev", EV_VOLATILE, arc_fmtdev(&currdev),
-	    arc_setcurrdev, env_nounset);
-	env_setenv("loaddev", EV_VOLATILE, arc_fmtdev(&currdev), env_noset,
-	    env_nounset);
 #endif
 
+	env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
+	    efi_setcurrdev, env_nounset);
+	env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
+	    env_nounset);
+
 	setenv("LINES", "24", 1);	/* optional */
     
 	archsw.arch_autoload = efi_autoload;
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index 2940d8a92c6..0d8aa12a7f9 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -106,13 +106,13 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
 	bootfile = GetEnvironmentVariable(ARCENV_BOOTFILE);
 	if (bootfile)
 		setenv("bootfile", bootfile, 1);
-
-	env_setenv("currdev", EV_VOLATILE, arc_fmtdev(&currdev),
-	    arc_setcurrdev, env_nounset);
-	env_setenv("loaddev", EV_VOLATILE, arc_fmtdev(&currdev), env_noset,
-	    env_nounset);
 #endif
 
+	env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
+	    efi_setcurrdev, env_nounset);
+	env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
+	    env_nounset);
+
 	setenv("LINES", "24", 1);	/* optional */
     
 	archsw.arch_autoload = efi_autoload;