svn commit: r206174 - head/sys/vm

[Alan Cox]

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