From owner-svn-src-user@FreeBSD.ORG Sun Jan 29 16:29:06 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72C49106564A; Sun, 29 Jan 2012 16:29:06 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 61F218FC0C; Sun, 29 Jan 2012 16:29:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0TGT6qV043720; Sun, 29 Jan 2012 16:29:06 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0TGT602043718; Sun, 29 Jan 2012 16:29:06 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201201291629.q0TGT602043718@svn.freebsd.org> From: Attilio Rao Date: Sun, 29 Jan 2012 16:29:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230749 - user/attilio/vmcontention/sys/vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2012 16:29:06 -0000 Author: attilio Date: Sun Jan 29 16:29:06 2012 New Revision: 230749 URL: http://svn.freebsd.org/changeset/base/230749 Log: Fix format string for the pindex members as they should be treated as uintmax_t for compatibility among 32/64 bits. Modified: user/attilio/vmcontention/sys/vm/vm_radix.c Modified: user/attilio/vmcontention/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmcontention/sys/vm/vm_radix.c Sun Jan 29 16:11:25 2012 (r230748) +++ user/attilio/vmcontention/sys/vm/vm_radix.c Sun Jan 29 16:29:06 2012 (r230749) @@ -277,8 +277,8 @@ vm_radix_insert(struct vm_radix *rtree, * there is sufficient space. */ while (level == 0 || index > VM_RADIX_MAX(level)) { - CTR3(KTR_VM, "insert: expanding %jd > %jd height %d", - index, VM_RADIX_MAX(level), level); + CTR3(KTR_VM, "insert: expanding %ju > %ju height %d", + (uintmax_t)index, (uintmax_t)VM_RADIX_MAX(level), level); level++; KASSERT(level <= VM_RADIX_LIMIT, ("vm_radix_insert: Tree %p height %d too tall", @@ -461,9 +461,9 @@ restart: start += inc; slot++; CTR5(KTR_VM, - "leaf: start %ju end %ju inc %d mask 0x%lX slot %d", - (uintmax_t)start, (uintmax_t)end, inc, - ~VM_RADIX_MAX(level), slot); + "leaf: start %ju end %ju inc %ju mask 0x%jX slot %d", + (uintmax_t)start, (uintmax_t)end, (uintmax_t)inc, + (uintmax_t)~VM_RADIX_MAX(level), slot); for (; slot < VM_RADIX_COUNT; slot++, start += inc) { if (end != 0 && start >= end) { rnode = NULL; @@ -604,8 +604,9 @@ restart: index -= inc; slot--; CTR4(KTR_VM, - "lookup_le: start %ju inc %ld mask 0x%lX slot %d", - (uintmax_t)index, inc, VM_RADIX_MAX(level), slot); + "lookup_le: start %ju inc %ju mask 0x%jX slot %d", + (uintmax_t)index, (uintmax_t)inc, + (uintmax_t)VM_RADIX_MAX(level), slot); for (; slot >= 0; slot--, index -= inc) { child = rnode->rn_child[slot]; if (child)