Date: Fri, 03 Sep 2010 02:57:03 -0400 From: jhell <jhell@DataIX.net> To: Rob Farmer <rfarmer@predatorlabs.net> Cc: freebsd-fs@freebsd.org, freebsd-current@freebsd.org Subject: Re: ZFS v28 is ready for wider testing. Message-ID: <4C809C3F.10706@DataIX.net> In-Reply-To: <AANLkTim=Tiwo115ML07yJarOjKA%2BMr-4uYwpV-m6xxi6@mail.gmail.com> References: <20100831215915.GE1932@garage.freebsd.pl> <AANLkTim=Tiwo115ML07yJarOjKA%2BMr-4uYwpV-m6xxi6@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig62313E93F16F60022DDAC2FA
Content-Type: multipart/mixed; boundary="------------000108090209070800040508"
This is a multi-part message in MIME format.
--------------000108090209070800040508
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
On 09/02/2010 04:55, Rob Farmer wrote:
>=20
> I tried applying the patch to r212087 to rule out recent changes to
> dtrace, but it made no difference. I used patch -E -p0 < patch.
>=20
Hi Rob,
I see that in your build error are a bunch of things to do with atomic.h
and I recalled a patch from pjd@ on current@ that he sent in the same
thread. I attached the downloaded patch. Maybe you can write back and
site if it helped at all so people have a reference.
Regards,
--=20
jhell,v
--------------000108090209070800040508
Content-Type: text/plain;
name="atomic.h.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="atomic.h.patch"
--- 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 *new=
val);
#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)cm=
p,
- (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)cm=
p,
- (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_ */
--------------000108090209070800040508--
--------------enig62313E93F16F60022DDAC2FA
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJMgJxGAAoJEJBXh4mJ2FR+sEoH/0GeSafbV/bBE62OejKnryVk
3eSKAap2xC8YnOVNNQckPTAJ82ArZprJ3YF6UssjVvYZZky6oZuJpP+SQ1ipzBtE
9CGUwo3jVqt44CJt3ARRef2DyegIPyZYg8MnTBsqAJsThDbgW+Q8ndKqlc1Ja902
uUHyVtU1Nfz6P7CMZJUZ1Jk93ZJAONIdMXAJ1kcCqar4O43a0tfPVNuE1XUfgnbO
00xZCxiP2ZZOcfoMvMDD6ZxdeuwA7tc/sDp4DehC8gGGSvuL1SjFeRh3xoPuuihT
YeiU5dLj3AWt8mANW6JbAmyw+3s0w9QP5wRPbb3aXVukbMPW2EdYgesWHaadcZw=
=ce0L
-----END PGP SIGNATURE-----
--------------enig62313E93F16F60022DDAC2FA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4C809C3F.10706>