Date: Wed, 13 Nov 2002 14:28:02 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21047 for review Message-ID: <200211132228.gADMS2I7074387@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21047 Change 21047 by peter@peter_daintree on 2002/11/13 14:27:47 revert to vendor Affected files ... .. //depot/projects/ia64/sys/vm/uma_core.c#29 edit Differences ... ==== //depot/projects/ia64/sys/vm/uma_core.c#29 (text+ko) ==== @@ -149,9 +149,7 @@ /* Prototypes.. */ -#ifndef MD_HAVE_OBJ_ALLOC static void *obj_alloc(uma_zone_t, int, u_int8_t *, int); -#endif static void *page_alloc(uma_zone_t, int, u_int8_t *, int); static void page_free(void *, int, u_int8_t); static uma_slab_t slab_zalloc(uma_zone_t, int); @@ -801,7 +799,6 @@ return (p); } -#ifndef MD_HAVE_OBJ_ALLOC /* * Allocates a number of pages from within an object * @@ -849,7 +846,6 @@ return ((void *)retkva); } -#endif /* * Frees a number of pages to the system @@ -1912,7 +1908,6 @@ ZONE_UNLOCK(zone); } -#ifndef MD_HAVE_UMA_ZONE_SET_OBJ /* See uma.h */ int uma_zone_set_obj(uma_zone_t zone, struct vm_object *obj, int count) @@ -1934,6 +1929,7 @@ return (0); } + if (obj == NULL) obj = vm_object_allocate(OBJT_DEFAULT, pages); @@ -1954,7 +1950,6 @@ return (1); } -#endif /* See uma.h */ void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211132228.gADMS2I7074387>