From owner-svn-src-all@FreeBSD.ORG Thu Jun 16 07:22:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 123A2106564A; Thu, 16 Jun 2011 07:22:21 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 83FFD8FC0A; Thu, 16 Jun 2011 07:22:20 +0000 (UTC) Received: by vws18 with SMTP id 18so1336813vws.13 for ; Thu, 16 Jun 2011 00:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=Seza2/EW2OmUMtiF99qrc0g6KEPQhdfms/qp2kr1rmY=; b=ZhUu0cYOqAs9mcwb+G7JRKglwUZeNdwGMDv1gpGFjmVIK4mSBRlW+xfpVuoNB5JRXJ 2dIz2ghDdchLbzw6LTByMX71OHuuyrpInUIZ6ngBEZs9IBEZXGluMGwQqDLoKzzoiFkh /xDYOlQAX1SAMZzWbRR/IWzf5kpx8UQU5oDq4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=U5FBZl8rmaIBilijVOaL+yWaSUoWzGnfZ/4b6zYbeK410ReK1zyiNY79tOKagrVDNC f9IkzYduSQiZn9iZsdPUeMiOT9wUX3cbm/1xU8nINau38sT/7uA8ZBa4X64/enS1borK qN0zMaAO+P2w4cRWwIEyyDy0bs2mzJqkLwvZE= MIME-Version: 1.0 Received: by 10.220.177.9 with SMTP id bg9mr212541vcb.93.1308208939806; Thu, 16 Jun 2011 00:22:19 -0700 (PDT) Received: by 10.220.189.202 with HTTP; Thu, 16 Jun 2011 00:22:19 -0700 (PDT) In-Reply-To: References: <201106160714.p5G7Etfx017112@svn.freebsd.org> Date: Thu, 16 Jun 2011 00:22:19 -0700 Message-ID: From: Garrett Cooper To: Tai-hwa Liang Content-Type: multipart/mixed; boundary=90e6ba4fc6102630e004a5cf21cb Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r223139 - head/lib/libstand X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2011 07:22:21 -0000 --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 wrote= : > On Thu, Jun 16, 2011 at 12:14 AM, Tai-hwa Liang 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 >> >> 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 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--