Index: head/sys/modules/geom/Makefile
===================================================================
--- head/sys/modules/geom/Makefile	(revision 307676)
+++ head/sys/modules/geom/Makefile	(revision 307677)
@@ -1,33 +1,37 @@
 # $FreeBSD$
 
 SYSDIR?=${.CURDIR}/../..
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=	geom_bde \
 	geom_cache \
 	geom_concat \
-	geom_eli \
 	geom_gate \
 	geom_journal \
 	geom_label \
 	geom_linux_lvm \
 	geom_mirror \
 	geom_mountver \
 	geom_multipath \
 	geom_nop \
 	geom_part \
 	geom_raid \
 	geom_raid3 \
 	geom_sched \
 	geom_shsec \
 	geom_stripe \
 	geom_uzip \
 	geom_vinum \
 	geom_virstor \
 	geom_zero
 
 .if ${MK_CCD} != "no" || defined(ALL_MODULES)
 SUBDIR+=	geom_ccd
+.endif
+
+# Alignment issues in g_eli_auth_run() on MIPS64 causes kernel panic
+.if ${MACHINE_ARCH} != "mips64" && ${MACHINE_ARCH} != "mips64el"
+SUBDIR+=	geom_eli
 .endif
 
 .include <bsd.subdir.mk>