From owner-freebsd-current@FreeBSD.ORG Thu Sep 2 09:05:07 2010 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 5FEE510656FB; Thu, 2 Sep 2010 09:05:07 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 6F0508FC16; Thu, 2 Sep 2010 09:04:55 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id EE18345CDD; Thu, 2 Sep 2010 11:04:53 +0200 (CEST) Received: from localhost (pdawidek.whl [10.0.1.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id A958845B36; Thu, 2 Sep 2010 11:04:48 +0200 (CEST) Date: Thu, 2 Sep 2010 11:04:39 +0200 From: Pawel Jakub Dawidek To: Rob Farmer Message-ID: <20100902090439.GB29617@garage.freebsd.pl> References: <20100831215915.GE1932@garage.freebsd.pl> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZmUaFz6apKcXQszQ" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-5.9 required=4.5 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 Cc: freebsd-fs@freebsd.org, freebsd-current@freebsd.org Subject: Re: ZFS v28 is ready for wider testing. 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: Thu, 02 Sep 2010 09:05:07 -0000 --ZmUaFz6apKcXQszQ Content-Type: multipart/mixed; boundary="hHWLQfXTYDoKhP50" Content-Disposition: inline --hHWLQfXTYDoKhP50 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 02, 2010 at 01:55:51AM -0700, Rob Farmer wrote: > On Tue, Aug 31, 2010 at 2:59 PM, Pawel Jakub Dawidek wr= ote: > > > > Ok, now that I know you read everything carefully, here is the patch: > > > > =A0 =A0 =A0 =A0http://people.freebsd.org/~pjd/patches/zfs_20100831.patc= h.bz2 > > >=20 > buildworld on i386 (yes I know ZFS isn't ideal there): [...] Yes, I know about this problem, You can use attached patch or wait for full patch, which I'll be sending later today. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --hHWLQfXTYDoKhP50 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="atomic.h.patch" Content-Transfer-Encoding: quoted-printable --- sys/cddl/compat/opensolaris/sys/atomic.h +++ sys/cddl/compat/opensolaris/sys/atomic.h @@ -39,10 +39,9 @@ #ifndef __LP64__ extern void atomic_add_64(volatile uint64_t *target, int64_t delta); extern void atomic_dec_64(volatile uint64_t *target); -extern void *atomic_cas_ptr(volatile void *target, void *cmp, void *newva= l); #endif #ifndef __sparc64__ -extern uint64_t atomic_cas_32(volatile uint32_t *target, uint32_t cmp, +extern uint32_t atomic_cas_32(volatile uint32_t *target, uint32_t cmp, uint32_t newval); extern uint64_t atomic_cas_64(volatile uint64_t *target, uint64_t cmp, uint64_t newval); @@ -119,21 +118,19 @@ } =20 #ifndef COMPAT_32BIT -#if defined(__LP64__) +#ifdef __LP64__ static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { - return ((void *)atomic_cas_64((volatile uint64_t *)target, (uint64_t)cmp, - (uint64_t)newval)); + return ((void *)atomic_cas_64(target, (uint64_t)cmp, (uint64_t)newval)); } #else static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { - return ((void *)atomic_cas_32((volatile uint64_t *)target, (uint64_t)cmp, - (uint64_t)newval)); + return ((void *)atomic_cas_32(target, (uint32_t)cmp, (uint32_t)newval)); } #endif -#endif +#endif /* !COMPAT_32BIT */ =20 #endif /* !_OPENSOLARIS_SYS_ATOMIC_H_ */ --hHWLQfXTYDoKhP50-- --ZmUaFz6apKcXQszQ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkx/aKcACgkQForvXbEpPzR1NgCfSnScNjJXmF4glzhV0HLFSajN FikAoMjsbxt5Qp1xSu32PvK+4N5gOeGY =BeVA -----END PGP SIGNATURE----- --ZmUaFz6apKcXQszQ--