Date: Thu, 16 Jun 2011 00:22:19 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: Tai-hwa Liang <avatar@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r223139 - head/lib/libstand Message-ID: <BANLkTimG4svFzv1QPiKQcC7QdChLica9xA@mail.gmail.com> In-Reply-To: <BANLkTi=X0_SBLAQ6t7amTLv7jF6_oXAV4Q@mail.gmail.com> References: <201106160714.p5G7Etfx017112@svn.freebsd.org> <BANLkTi=X0_SBLAQ6t7amTLv7jF6_oXAV4Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--90e6ba4fc6102630e004a5cf21cb Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Thu, Jun 16, 2011 at 12:19 AM, Garrett Cooper <yanegomi@gmail.com> wrote= : > On Thu, Jun 16, 2011 at 12:14 AM, Tai-hwa Liang <avatar@freebsd.org> wrot= e: >> Author: avatar >> Date: Thu Jun 16 07:14:55 2011 >> New Revision: 223139 >> URL: http://svn.freebsd.org/changeset/base/223139 >> >> Log: >> =A0Unbreaking build on sparc64. >> >> =A0Submitted by: Garrett Cooper <yanegomi@gmail.com> >> >> Modified: >> =A0head/lib/libstand/zalloc.c >> >> Modified: head/lib/libstand/zalloc.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/lib/libstand/zalloc.c =A0Thu Jun 16 05:26:03 2011 =A0 =A0 =A0 = =A0(r223138) >> +++ head/lib/libstand/zalloc.c =A0Thu Jun 16 07:14:55 2011 =A0 =A0 =A0 = =A0(r223139) >> @@ -154,7 +154,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t by >> =A0 =A0 if ((char *)ptr < (char *)mp->mp_Base || >> =A0 =A0 =A0 =A0(char *)ptr + bytes > (char *)mp->mp_End || >> =A0 =A0 =A0 =A0((iaddr_t)ptr & MEMNODE_SIZE_MASK) !=3D 0) >> - =A0 =A0 =A0 panic("zfree(%p,%d): wild pointer", ptr, bytes); >> + =A0 =A0 =A0 panic("zfree(%p,%ju): wild pointer", ptr, bytes); > > All of those need to be cast to (uintmax_t). Sorry :(.. And you need to add #include <stdint.h> to stand.h in order to get uintmax_t. Here's a proper patch for amd64.. Let me run this through make universe first though.. Thanks, -Garrett --90e6ba4fc6102630e004a5cf21cb Content-Type: text/x-patch; charset=US-ASCII; name="unbreak-libstand-zalloc-compile-take2.patch" Content-Disposition: attachment; filename="unbreak-libstand-zalloc-compile-take2.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gozds20h0 SW5kZXg6IGxpYi9saWJzdGFuZC96YWxsb2MuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBsaWIvbGlic3RhbmQv emFsbG9jLmMJKHJldmlzaW9uIDIyMzE0MCkKKysrIGxpYi9saWJzdGFuZC96YWxsb2MuYwkod29y a2luZyBjb3B5KQpAQCAtMTU0LDcgKzE1NCw3IEBACiAgICAgaWYgKChjaGFyICopcHRyIDwgKGNo YXIgKiltcC0+bXBfQmFzZSB8fCAKIAkoY2hhciAqKXB0ciArIGJ5dGVzID4gKGNoYXIgKiltcC0+ bXBfRW5kIHx8CiAJKChpYWRkcl90KXB0ciAmIE1FTU5PREVfU0laRV9NQVNLKSAhPSAwKQotCXBh bmljKCJ6ZnJlZSglcCwlanUpOiB3aWxkIHBvaW50ZXIiLCBwdHIsIGJ5dGVzKTsKKwlwYW5pYygi emZyZWUoJXAsJWp1KTogd2lsZCBwb2ludGVyIiwgcHRyLCAodWludG1heF90KWJ5dGVzKTsKIAog ICAgIC8qCiAgICAgICogZnJlZSB0aGUgc2VnbWVudApAQCAtMTc4LDcgKzE3OCw4IEBACiAJCSAq IHJhbmdlIGNoZWNrCiAJCSAqLwogCQlpZiAoKGNoYXIgKilwdHIgKyBieXRlcyA+IChjaGFyICop bW4pCi0JCSAgICBwYW5pYygiemZyZWUoJXAsJWp1KTogY29ycnVwdCBtZW1saXN0MSIscHRyLCBi eXRlcyk7CisJCSAgICBwYW5pYygiemZyZWUoJXAsJWp1KTogY29ycnVwdCBtZW1saXN0MSIsIHB0 ciwKKwkJICAgICAgICAodWludG1heF90KWJ5dGVzKTsKIAogCQkvKgogCQkgKiBtZXJnZSBhZ2Fp bnN0IG5leHQgYXJlYSBvciBjcmVhdGUgaW5kZXBlbmRhbnQgYXJlYQpAQCAtMjA5LDcgKzIxMCw4 IEBACiAJCS8qIE5PVCBSRUFDSEVEICovCiAJICAgIH0KIAkgICAgaWYgKChjaGFyICopcHRyIDwg KGNoYXIgKiltbiArIG1uLT5tcl9CeXRlcykKLQkJcGFuaWMoInpmcmVlKCVwLCVqdSk6IGNvcnJ1 cHQgbWVtbGlzdDIiLCBwdHIsIGJ5dGVzKTsKKwkJcGFuaWMoInpmcmVlKCVwLCVqdSk6IGNvcnJ1 cHQgbWVtbGlzdDIiLCBwdHIsCisJCSAgICAodWludG1heF90KWJ5dGVzKTsKIAl9CiAJLyoKIAkg KiBXZSBhcmUgYmV5b25kIHRoZSBsYXN0IE1lbU5vZGUsIGFwcGVuZCBuZXcgTWVtTm9kZS4gIE1l cmdlIGFnYWluc3QKSW5kZXg6IGxpYi9saWJzdGFuZC9zdGFuZC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxp Yi9saWJzdGFuZC9zdGFuZC5oCShyZXZpc2lvbiAyMjMxNDApCisrKyBsaWIvbGlic3RhbmQvc3Rh bmQuaAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsNyBAQAogI2luY2x1ZGUgPHN5cy9jZGVm cy5oPgogI2luY2x1ZGUgPHN5cy9zdGF0Lmg+CiAjaW5jbHVkZSA8c3lzL2RpcmVudC5oPgorI2lu Y2x1ZGUgPHN0ZGludC5oPgogI2luY2x1ZGUgPHN0cmluZy5oPgogCiAjZGVmaW5lIENISyhmbXQs IGFyZ3MuLi4pCXByaW50ZigiJXMoJWQpOiAiIGZtdCAiXG4iLCBfX2Z1bmNfXywgX19MSU5FX18g LCAjI2FyZ3MpCg== --90e6ba4fc6102630e004a5cf21cb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BANLkTimG4svFzv1QPiKQcC7QdChLica9xA>