From owner-svn-src-head@FreeBSD.ORG  Mon Apr  5 06:23:31 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7476106566B;
	Mon,  5 Apr 2010 06:23:31 +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 C6D6A8FC08;
	Mon,  5 Apr 2010 06:23:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o356NVVK046406;
	Mon, 5 Apr 2010 06:23:31 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o356NVPo046404;
	Mon, 5 Apr 2010 06:23:31 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201004050623.o356NVPo046404@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 5 Apr 2010 06:23:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206174 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Apr 2010 06:23:31 -0000

Author: alc
Date: Mon Apr  5 06:23:31 2010
New Revision: 206174
URL: http://svn.freebsd.org/changeset/base/206174

Log:
  vm_reserv_alloc_page() should never be called on an OBJT_SG object, just as
  it is never called on an OBJT_DEVICE object.  (This change should have been
  included in r195840.)
  
  Reported by:	dougb@, avg@
  MFC after:	3 days

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Mon Apr  5 01:51:11 2010	(r206173)
+++ head/sys/vm/vm_page.c	Mon Apr  5 06:23:31 2010	(r206174)
@@ -1084,6 +1084,7 @@ vm_page_alloc(vm_object_t object, vm_pin
 			return (NULL);
 #if VM_NRESERVLEVEL > 0
 		} else if (object == NULL || object->type == OBJT_DEVICE ||
+		    object->type == OBJT_SG ||
 		    (object->flags & OBJ_COLORED) == 0 ||
 		    (m = vm_reserv_alloc_page(object, pindex)) == NULL) {
 #else