From owner-svn-src-stable@FreeBSD.ORG Sun Jan 18 19:37:37 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 548141065680; Sun, 18 Jan 2009 19:37:37 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2C78FC1C; Sun, 18 Jan 2009 19:37:37 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IJbbVD084666; Sun, 18 Jan 2009 19:37:37 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0IJbbYL084665; Sun, 18 Jan 2009 19:37:37 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200901181937.n0IJbbYL084665@svn.freebsd.org> From: Alan Cox Date: Sun, 18 Jan 2009 19:37:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187407 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2009 19:37:39 -0000 Author: alc Date: Sun Jan 18 19:37:36 2009 New Revision: 187407 URL: http://svn.freebsd.org/changeset/base/187407 Log: MFC rev 180598 Eliminate stale comments from kmem_malloc(). Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/vm/vm_kern.c Modified: stable/7/sys/vm/vm_kern.c ============================================================================== --- stable/7/sys/vm/vm_kern.c Sun Jan 18 19:33:55 2009 (r187406) +++ stable/7/sys/vm/vm_kern.c Sun Jan 18 19:37:36 2009 (r187407) @@ -267,9 +267,6 @@ kmem_suballoc(parent, min, max, size) * We don't worry about expanding the map (adding entries) since entries * for wired maps are statically allocated. * - * NOTE: This routine is not supposed to block if M_NOWAIT is set, but - * I have not verified that it actually does not block. - * * `map' is ONLY allowed to be kmem_map or one of the mbuf submaps to * which we never free. */ @@ -321,15 +318,6 @@ kmem_malloc(map, size, flags) vm_map_insert(map, kmem_object, offset, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0); - /* - * Note: if M_NOWAIT specified alone, allocate from - * interrupt-safe queues only (just the free list). If - * M_USE_RESERVE is also specified, we can also - * allocate from the cache. Neither of the latter two - * flags may be specified from an interrupt since interrupts - * are not allowed to mess with the cache queue. - */ - if ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else