From owner-freebsd-current@FreeBSD.ORG Fri May 8 22:01:16 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0929106566B for ; Fri, 8 May 2009 22:01:16 +0000 (UTC) (envelope-from artemb@gmail.com) Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DDA78FC1B for ; Fri, 8 May 2009 22:01:16 +0000 (UTC) (envelope-from artemb@gmail.com) Received: by yw-out-2324.google.com with SMTP id 9so992041ywe.13 for ; Fri, 08 May 2009 15:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=FTknzAL2wk3CpKSXu7qu0sWY7cxfRTz4fZ3f06Y6j7s=; b=gdbmHuyCAkGwb1Abmav4oCO63+uvPP20nSpHBQRIxkL0QkJZvcPnmLe1MNqrDfqaKp m0cUu0k3DRWF8WPgi9WZ5NkDB/eQSiQYS8WvfC9a++85iCK7uU3JRnNyRlqQYGuSHxtR IrafVOZ2Ds36cdl9ajyDSeW/b6op7fc2qqu2Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=BAZInhAGwkJjquqtgravu22d4kTUcptqSc94mB72YTRwA2ZcqlWiw/Br95D0GgPEP4 hSKwD7CdgsY0FOQEKae+s+euW6uqZhewdDuS7uMOygEzodbT3dEz4fwyw/tUbZ8YlMP4 q0MzGzxc2GsQoyM040kNSKn9hHq7KcIChBHo8= MIME-Version: 1.0 Received: by 10.100.215.13 with SMTP id n13mr1754910ang.88.1241820075876; Fri, 08 May 2009 15:01:15 -0700 (PDT) Date: Fri, 8 May 2009 15:01:15 -0700 Message-ID: From: Artem Belevich To: freebsd-current@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Fri, 08 May 2009 22:04:36 +0000 Subject: [patch] zfs.ko loading failure X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2009 22:01:17 -0000 Hi, After recent changes (r191915) opensolaris.ko refers to utsname variable that's actually compiled into zfs.ko In turn zfs.ko requires symbols from opensolaris.ko and this circular dependency leads to failure to load zfs.ko. Following patch moves opensolaris_misc.c to modules/opensolaris and fixes the issue --Artem diff -r fae94895cc67 sys/modules/opensolaris/Makefile --- a/sys/modules/opensolaris/Makefile Fri May 08 12:22:10 2009 -0700 +++ b/sys/modules/opensolaris/Makefile Fri May 08 14:59:51 2009 -0700 @@ -1,15 +1,16 @@ # $FreeBSD: head/sys/modules/opensolaris/Makefile 190374 2009-03-24 15:48:35Z marius $ .PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern KMOD= opensolaris SRCS= opensolaris.c \ opensolaris_cmn_err.c \ + opensolaris_misc.c \ opensolaris_kmem.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 .else SRCS+= opensolaris_atomic.c .endif diff -r fae94895cc67 sys/modules/zfs/Makefile --- a/sys/modules/zfs/Makefile Fri May 08 12:22:10 2009 -0700 +++ b/sys/modules/zfs/Makefile Fri May 08 14:59:51 2009 -0700 @@ -15,17 +15,16 @@ SRCS+= nvpair.c .PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode SRCS+= u8_textprep.c .PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern 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 SRCS+= opensolaris_zone.c .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" .PATH: ${SUNW}/common/atomic/${MACHINE_ARCH} SRCS+= atomic.S