svn commit: r206410 - stable/8/sys/vm

[Alan Cox]

Author: alc
Date: Fri Apr  9 06:40:30 2010
New Revision: 206410
URL: http://svn.freebsd.org/changeset/base/206410

Log:
  MFC r206174
    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.)

Modified:
  stable/8/sys/vm/vm_page.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/vm/vm_page.c
==============================================================================
--- stable/8/sys/vm/vm_page.c	Fri Apr  9 02:39:20 2010	(r206409)
+++ stable/8/sys/vm/vm_page.c	Fri Apr  9 06:40:30 2010	(r206410)
@@ -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