From owner-svn-src-all@FreeBSD.ORG Mon Feb 17 20:25:17 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DDEB7C1F; Mon, 17 Feb 2014 20:25:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C89931C97; Mon, 17 Feb 2014 20:25:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HKPHWq034484; Mon, 17 Feb 2014 20:25:17 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HKPH9d034483; Mon, 17 Feb 2014 20:25:17 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201402172025.s1HKPH9d034483@svn.freebsd.org> From: Dimitry Andric Date: Mon, 17 Feb 2014 20:25:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262127 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 17 Feb 2014 20:25:18 -0000 Author: dim Date: Mon Feb 17 20:25:17 2014 New Revision: 262127 URL: http://svnweb.freebsd.org/changeset/base/262127 Log: MFC r261896: After r251709, avoid a clang 3.4 warning about an unused static const variable (uma_max_ipers), when asserts are disabled. Reviewed by: glebius Modified: stable/10/sys/vm/uma_core.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/uma_core.c ============================================================================== --- stable/10/sys/vm/uma_core.c Mon Feb 17 20:19:34 2014 (r262126) +++ stable/10/sys/vm/uma_core.c Mon Feb 17 20:25:17 2014 (r262127) @@ -150,9 +150,6 @@ static int booted = 0; #define UMA_STARTUP 1 #define UMA_STARTUP2 2 -/* Maximum number of allowed items-per-slab if the slab header is OFFPAGE */ -static const u_int uma_max_ipers = SLAB_SETSIZE; - /* * Only mbuf clusters use ref zones. Just provide enough references * to support the one user. New code should not use the ref facility. @@ -1388,7 +1385,7 @@ keg_cachespread_init(uma_keg_t keg) keg->uk_slabsize = UMA_SLAB_SIZE; keg->uk_ipers = ((pages * PAGE_SIZE) + trailer) / rsize; keg->uk_flags |= UMA_ZONE_OFFPAGE | UMA_ZONE_VTOSLAB; - KASSERT(keg->uk_ipers <= uma_max_ipers, + KASSERT(keg->uk_ipers <= SLAB_SETSIZE, ("%s: keg->uk_ipers too high(%d) increase max_ipers", __func__, keg->uk_ipers)); }