From owner-svn-src-head@FreeBSD.ORG Sun May 12 21:37:31 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0AEDC564 for ; Sun, 12 May 2013 21:37:31 +0000 (UTC) (envelope-from mailer-daemon@vniz.net) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by mx1.freebsd.org (Postfix) with ESMTP id 87A24D7 for ; Sun, 12 May 2013 21:37:30 +0000 (UTC) Received: by mail-lb0-f181.google.com with SMTP id w10so5718934lbi.40 for ; Sun, 12 May 2013 14:37:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:openpgp:content-type :content-transfer-encoding:x-gm-message-state; bh=CY7ZcbhBVsGw/J6YtP1zTX5hlBRMPCfAQxh69e+5ykg=; b=X1QkXVYRgaozogzWy1223gAj8dneNnAIZ8uHLw/xqP2UmxMvFTbMD+qaycwQBPYjD4 VfFzeu7KKW4TYY4wjbnhSwi7iMAM1PGI//MenkrsIFgAO9APPnKo+GaeXwMSOgch9Xwg EJlI2rvfTx5D3s2Q6ZjRJqFhMlvBdd197C9JMhHWpW53WlzhPOYEVx4Oc/MYzVuzs3gW 1Pe7m7HKxWfrgxccymIKhseNJCymp2N18OTAJTH8kThSN9REolGBVsUt1vVeBvWsh2oz yNztUUGYVerTRJkXWB3a0Y+zfNqK6/T8LrVXbsRFwy3vpslAUE2x08ssWqzwZsfn/S65 fXXA== X-Received: by 10.112.139.4 with SMTP id qu4mr11398211lbb.37.1368394649061; Sun, 12 May 2013 14:37:29 -0700 (PDT) Received: from [192.168.1.2] ([89.169.163.3]) by mx.google.com with ESMTPSA id y3sm4392654lby.12.2013.05.12.14.37.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 12 May 2013 14:37:28 -0700 (PDT) Message-ID: <51900B97.20406@freebsd.org> Date: Mon, 13 May 2013 01:37:27 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130328 Thunderbird/17.0.5 MIME-Version: 1.0 To: Alan Cox Subject: Re: svn commit: r250577 - head/sys/vm References: <201305121650.r4CGoJL0087149@svn.freebsd.org> In-Reply-To: <201305121650.r4CGoJL0087149@svn.freebsd.org> OpenPGP: id=964474DD Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Gm-Message-State: ALoCoQlAcfRLTn3phO8wx1L1wztENbk8iU32a9Fn4LYxj6xeAH8zYLHiCLO5uzElW3iuACglQQgs Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 21:37:31 -0000 On 12.05.2013 20:50, Alan Cox wrote: GNU cc errors related to part of diff below: cc1: warnings being treated as errors ../../../vm/vm_page.c: In function 'vm_page_alloc': ../../../vm/vm_page.c:1209: warning: 'mpred' may be used uninitialized in this function *** [vm_page.o] Error code 1 Formally yes, mpred here can be left unitialized. > @@ -1179,7 +1206,7 @@ vm_page_alloc(vm_object_t object, vm_pin > { > struct vnode *vp = NULL; > vm_object_t m_object; > - vm_page_t m; > + vm_page_t m, mpred; > int flags, req_class; > > KASSERT((object != NULL) == ((req & VM_ALLOC_NOOBJ) == 0), > @@ -1195,6 +1222,11 @@ vm_page_alloc(vm_object_t object, vm_pin > if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) > req_class = VM_ALLOC_SYSTEM; > > + if (object != NULL) { > + mpred = vm_radix_lookup_le(&object->rtree, pindex); > + KASSERT(mpred == NULL || mpred->pindex != pindex, > + ("vm_page_alloc: pindex already allocated")); > + } > mtx_lock(&vm_page_queue_free_mtx); > if (cnt.v_free_count + cnt.v_cache_count > cnt.v_free_reserved || > (req_class == VM_ALLOC_SYSTEM && > @@ -1225,8 +1257,8 @@ vm_page_alloc(vm_object_t object, vm_pin > return (NULL); > #if VM_NRESERVLEVEL > 0 > } else if (object == NULL || (object->flags & (OBJ_COLORED | > - OBJ_FICTITIOUS)) != OBJ_COLORED || > - (m = vm_reserv_alloc_page(object, pindex)) == NULL) { > + OBJ_FICTITIOUS)) != OBJ_COLORED || (m = > + vm_reserv_alloc_page(object, pindex, mpred)) == NULL) { > #else > } else { > #endif > @@ -1320,7 +1352,7 @@ vm_page_alloc(vm_object_t object, vm_pin > if (object->memattr != VM_MEMATTR_DEFAULT && > (object->flags & OBJ_FICTITIOUS) == 0) > pmap_page_set_memattr(m, object->memattr); > - vm_page_insert(m, object, pindex); > + vm_page_insert_after(m, object, pindex, mpred); > } else > m->pindex = pindex; -- http://ache.vniz.net/ bitcoin:13fGiNutKNHcVSsgtGQ7bQ5kgUKgEQHn7N