From 126b14f7e87fe56edcdf33be5ff6925de5c0290c Mon Sep 17 00:00:00 2001 From: Kip Macy Date: Sat, 9 May 2009 05:45:13 +0000 Subject: [PATCH] fix atomic.S rename and vimage breakage The latter was pointed out by Artem Belevich --- sys/modules/opensolaris/Makefile | 7 ++++--- sys/modules/zfs/Makefile | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile index a1df2a857dd..a0f08fbfa35 100644 --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -5,15 +5,16 @@ KMOD= opensolaris SRCS= opensolaris.c \ opensolaris_cmn_err.c \ - opensolaris_kmem.c + opensolaris_kmem.c \ + opensolaris_misc.c .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" .PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -SRCS+= atomic.S +SRCS+= opensolaris_atomic.S .else SRCS+= opensolaris_atomic.c .endif - + CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris \ -I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../.. diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 4f399a8f3b3..87b6ea1820c 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -20,7 +20,6 @@ SRCS+= opensolaris_kmem.c SRCS+= opensolaris_kobj.c SRCS+= opensolaris_kstat.c SRCS+= opensolaris_lookup.c -SRCS+= opensolaris_misc.c SRCS+= opensolaris_policy.c SRCS+= opensolaris_string.c SRCS+= opensolaris_vfs.c