From owner-svn-src-projects@FreeBSD.ORG Fri Nov 23 07:06:25 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CCBE7B9; Fri, 23 Nov 2012 07:06:25 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C90348FC13; Fri, 23 Nov 2012 07:06:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAN76Ops059863; Fri, 23 Nov 2012 07:06:24 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAN76Ok9059862; Fri, 23 Nov 2012 07:06:24 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201211230706.qAN76Ok9059862@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 23 Nov 2012 07:06:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243430 - projects/counters/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2012 07:06:25 -0000 Author: glebius Date: Fri Nov 23 07:06:24 2012 New Revision: 243430 URL: http://svnweb.freebsd.org/changeset/base/243430 Log: Right now PAGE_SIZE == UMA_SLAB_SIZE, but that can change in future. Use PAGE_SIZE when we are multiplying pages or uk_ppera. The change is a nop, but makes code consistent. Modified: projects/counters/sys/vm/uma_core.c Modified: projects/counters/sys/vm/uma_core.c ============================================================================== --- projects/counters/sys/vm/uma_core.c Fri Nov 23 07:02:01 2012 (r243429) +++ projects/counters/sys/vm/uma_core.c Fri Nov 23 07:06:24 2012 (r243430) @@ -746,9 +746,9 @@ finished: SKIP_NONE, ZFREE_STATFREE); #ifdef UMA_DEBUG printf("%s: Returning %d bytes.\n", - keg->uk_name, UMA_SLAB_SIZE * keg->uk_ppera); + keg->uk_name, PAGE_SIZE * keg->uk_ppera); #endif - keg->uk_freef(mem, UMA_SLAB_SIZE * keg->uk_ppera, flags); + keg->uk_freef(mem, PAGE_SIZE * keg->uk_ppera, flags); } } @@ -846,7 +846,7 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t wait |= M_NODUMP; /* zone is passed for legacy reasons. */ - mem = allocf(zone, keg->uk_ppera * UMA_SLAB_SIZE, &flags, wait); + mem = allocf(zone, keg->uk_ppera * PAGE_SIZE, &flags, wait); if (mem == NULL) { if (keg->uk_flags & UMA_ZONE_OFFPAGE) zone_free_item(keg->uk_slabzone, slab, NULL, @@ -908,7 +908,7 @@ keg_alloc_slab(uma_keg_t keg, uma_zone_t if (keg->uk_flags & UMA_ZONE_OFFPAGE) zone_free_item(keg->uk_slabzone, slab, NULL, SKIP_NONE, ZFREE_STATFREE); - keg->uk_freef(mem, UMA_SLAB_SIZE * keg->uk_ppera, + keg->uk_freef(mem, PAGE_SIZE * keg->uk_ppera, flags); KEG_LOCK(keg); return (NULL); @@ -1193,10 +1193,10 @@ keg_large_init(uma_keg_t keg) KASSERT((keg->uk_flags & UMA_ZFLAG_CACHEONLY) == 0, ("keg_large_init: Cannot large-init a UMA_ZFLAG_CACHEONLY keg")); - pages = keg->uk_size / UMA_SLAB_SIZE; + pages = keg->uk_size / PAGE_SIZE; /* Account for remainder */ - if ((pages * UMA_SLAB_SIZE) < keg->uk_size) + if ((pages * PAGE_SIZE) < keg->uk_size) pages++; keg->uk_ppera = pages;