===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/share/mk/Attic/bsd.lkm.mk,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- src/share/mk/Attic/bsd.lkm.mk	2005/09/15 07:12:18	1.20
+++ src/share/mk/Attic/bsd.lkm.mk	2007/11/04 00:06:19	1.21
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.lkm.mk,v 1.20 2005/09/15 07:12:18 espie Exp $
+#	$OpenBSD: bsd.lkm.mk,v 1.21 2007/11/04 00:06:19 mikeb Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -20,6 +20,10 @@
 CFLAGS+=	${CDIAGFLAGS}
 .endif
 
+.if ${MACHINE} == "amd64"
+CFLAGS+=	-mcmodel=kernel
+.endif
+
 LDFLAGS+= -r
 .if defined(LKM)
 SRCS?=	${LKM}.c
@@ -86,13 +90,14 @@
 
 load:	${COMBINED}
 	if [ -x ${.CURDIR}/${POSTINSTALL} ]; then \
-		modload -d -o $(LKM) -e$(LKM) -p${.CURDIR}/${POSTINSTALL} $(COMBINED); \
+		modload -d -o ${LKM} -e${LKM}_lkmentry \
+		    -p${.CURDIR}/${POSTINSTALL} ${COMBINED}; \
 	else \
-		modload -d -o $(LKM) -e$(LKM) $(COMBINED); \
+		modload -d -o ${LKM} -e${LKM}_lkmentry ${COMBINED}; \
 	fi
 
 unload:
-	modunload -n $(LKM)
+	modunload -n ${LKM}
 
 install: maninstall _SUBDIRUSE