summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkmacy <kmacy@FreeBSD.org>2009-05-09 05:45:13 +0000
committerkmacy <kmacy@FreeBSD.org>2009-05-09 05:45:13 +0000
commitc2d44ad8f8ba6650acee0ef9f2be29c218e4a591 (patch)
treea2b33756991579ad23a3bb7f3897647f8a6dba2a /sys
parent78c3549a9f520aeaee0aad13d7da31d0b99d2209 (diff)
downloadFreeBSD-src-c2d44ad8f8ba6650acee0ef9f2be29c218e4a591.zip
FreeBSD-src-c2d44ad8f8ba6650acee0ef9f2be29c218e4a591.tar.gz
fix atomic.S rename and vimage breakage
The latter was pointed out by Artem Belevich
Diffstat (limited to 'sys')
-rw-r--r--sys/modules/opensolaris/Makefile7
-rw-r--r--sys/modules/zfs/Makefile1
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile
index a1df2a8..a0f08fb 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 4f399a8..87b6ea1 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
OpenPOWER on IntegriCloud