From owner-svn-src-all@FreeBSD.ORG Fri Nov 16 05:49:56 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C155C685; Fri, 16 Nov 2012 05:49:56 +0000 (UTC) (envelope-from kib@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 A777C8FC13; Fri, 16 Nov 2012 05:49:56 +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 qAG5nu81027280; Fri, 16 Nov 2012 05:49:56 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAG5nuWd027279; Fri, 16 Nov 2012 05:49:56 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201211160549.qAG5nuWd027279@svn.freebsd.org> From: Konstantin Belousov Date: Fri, 16 Nov 2012 05:49:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243131 - head/sys/vm X-SVN-Group: head 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.14 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: Fri, 16 Nov 2012 05:49:56 -0000 Author: kib Date: Fri Nov 16 05:49:56 2012 New Revision: 243131 URL: http://svnweb.freebsd.org/changeset/base/243131 Log: Explicitely state that M_USE_RESERVE requires M_NOWAIT, using assertion. Reviewed by: alc MFC after: 2 weeks Modified: head/sys/vm/vm_page.h Modified: head/sys/vm/vm_page.h ============================================================================== --- head/sys/vm/vm_page.h Fri Nov 16 04:25:35 2012 (r243130) +++ head/sys/vm/vm_page.h Fri Nov 16 05:49:56 2012 (r243131) @@ -353,6 +353,9 @@ malloc2vm_flags(int malloc_flags) { int pflags; + KASSERT((malloc_flags & M_USE_RESERVE) == 0 || + (malloc_flags & M_NOWAIT) != 0, + ("M_USE_RESERVE requires M_NOWAIT")); pflags = (malloc_flags & M_USE_RESERVE) != 0 ? VM_ALLOC_INTERRUPT : VM_ALLOC_SYSTEM; if ((malloc_flags & M_ZERO) != 0)