diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
--- a/stand/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
@@ -334,7 +334,10 @@
 	struct devdesc *rootdev;
 	struct file_metadata *md;
 	vm_offset_t addr;
-	uint64_t kernend, module;
+	uint64_t kernend;
+#ifdef MODINFOMD_MODULEP
+	uint64_t module;
+#endif
 	uint64_t envp;
 	vm_offset_t size;
 	char *rootdevname;
@@ -415,7 +418,7 @@
 	kernend = 0;	/* fill it in later */
 
 	/* Figure out the size and location of the metadata. */
-	module = *modulep = addr;
+	*modulep = addr;
 
 	file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof(howto), &howto);
 	file_addmetadata(kfp, MODINFOMD_ENVP, sizeof(envp), &envp);
@@ -428,6 +431,7 @@
 #endif
 	file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof(kernend), &kernend);
 #ifdef MODINFOMD_MODULEP
+	module = *modulep;
 	file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module);
 #endif
 #ifdef EFI